Merge branch 'master' into mimeicons-svg

.gitignore

apps/user_ldap/tests/access.php

apps/user_ldap/tests/user_ldap.php

core/css/mobile.css

core/css/styles.css

core/js/avatar.js

core/js/config.php

core/js/jquery.avatar.js

core/js/js.js

core/templates/layout.user.php

lib/base.php

lib/private/user.php

lib/private/user/session.php

settings/js/isadmin.php

settings/js/personal.js

settings/js/users.js

settings/routes.php

settings/templates/users.php

tests/lib/connector/sabre/file.php

tests/lib/urlgenerator.php