Merge branch 'master' into calendar

.htaccess

apps/contacts/ajax/addcard.php

apps/contacts/ajax/contacts.php

apps/contacts/css/styles.css

apps/contacts/index.php

apps/contacts/js/LICENSE.jquery.inview

apps/contacts/js/interface.js

apps/contacts/js/jquery.inview.txt

apps/contacts/lib/addressbook.php

apps/contacts/lib/vcard.php

core/js/setup.js

lib/filesystem.php

lib/image.php

lib/setup.php

lib/user.php

settings/js/users.js