add image authorization on upload_avatar
Merge pull request #1523 from dbarbera/avatar_formats_fix

add image authorization on upload_avatar
cloud66 easydeploy
Merge pull request #1526 from pkallberg/master

Cloud 66 EasyDeploy
security: when login is required don't return the site node in the preload store
Merge remote-tracking branch 'upstream/master'