Merge branch 'master' into subadmin

apps/calendar/appinfo/version

apps/contacts/ajax/addaddressbook.php

apps/contacts/ajax/importaddressbook.php

apps/contacts/ajax/selectaddressbook.php

apps/contacts/ajax/uploadimport.php

apps/contacts/appinfo/version

apps/contacts/css/contacts.css

apps/contacts/import.php

apps/contacts/index.php

apps/contacts/js/contacts.js

apps/contacts/js/jquery.inview.js

apps/contacts/lib/addressbook.php

apps/contacts/lib/app.php

apps/contacts/templates/index.php

apps/contacts/templates/part.chooseaddressbook.php

apps/contacts/templates/part.importaddressbook.php

apps/contacts/templates/part.selectaddressbook.php

apps/files/appinfo/version

apps/files/js/filelist.js

apps/files_sharing/ajax/email.php