Merge branch 'master' of https://github.com/librecms/librecms into content
Merge branch 'content' of https://github.com/librecms/librecms into content
Adding Collaborators on dropbox.