Merge branch 'master' into GuillaumeAmat-patch-1

.gitignore

apps/files_external/ajax/addRootCertificate.php

apps/files_external/lib/config.php

apps/user_ldap/lib/helper.php

apps/user_ldap/tests/access.php

apps/user_ldap/tests/user_ldap.php

config/config.sample.php

core/css/fixes.css

core/css/mobile.css

core/css/multiselect.css

core/css/styles.css

core/img/filetypes/application-javascript.png

core/img/filetypes/application-javascript.svg

core/img/filetypes/application-x-shockwave-flash.png

core/img/filetypes/application-x-shockwave-flash.svg

core/img/filetypes/text-calendar.png

core/img/filetypes/text-calendar.svg

core/js/avatar.js

core/js/config.php

core/js/jquery.avatar.js