Merge branch 'master' into movable_apps

3rdparty/fullcalendar/changelog.txt

3rdparty/fullcalendar/css/fullcalendar.css

3rdparty/fullcalendar/css/fullcalendar.print.css

3rdparty/fullcalendar/js/fullcalendar.js

3rdparty/fullcalendar/js/fullcalendar.min.js

3rdparty/fullcalendar/js/gcal.js

apps/contacts/ajax/currentphoto.php

apps/contacts/ajax/loadphoto.php

apps/contacts/ajax/oc_photo.php

apps/contacts/ajax/savecrop.php

apps/contacts/ajax/uploadphoto.php

apps/contacts/css/contacts.css

apps/contacts/import.php

apps/contacts/js/contacts.js

apps/contacts/photo.php

apps/contacts/templates/part.contact.php

apps/contacts/templates/part.contactphoto.php

apps/contacts/thumbnail.php

apps/files_encryption/js/settings.js

apps/files_encryption/lib/proxy.php