Fix PostgreSQL port configuration on install
Add tabs to conformance with owncloud code standards
Remove name from code
Remove unused spaces
Fix imagerotate and move loadFromBase64() one up.

imagerotate() with third parameter being -1 does not seem to work in PHP 5.5

loadFromBase64() one up, so debug-logs aren't spammed (as much) with urlencoded
base64-data from loadFromFile() debug output.
Hide remove image, if there's no custom avatar

Fix #7308
Use addClass('hidden') and removeClass('hidden')
Merge branch 'master' into hide_remove_image_avatar
Replace OC.Router.generate() with OC.generateUrl()
adding JSDoc + remove unused function
fixing download url in files app
remove OC.Router.registerLoadedCallback()
Add caching for getLocalFile on remote storages
fixing js unit tests
Removed obsolete OC.Router stubs in specHelper
Hide QMail when not selected and hide sendmail when not available on the server

Fix #7559
restrict height of settings and make scrollable
fix issue with Non-static method Imagick ../..; @ doesn't seem to work in this case
Merge branch 'master' into fix-7307

Conflicts:
	core/js/router.js
	settings/js/admin.js
adding new javascript function OC.generateUrl(url, params)