Merge branch 'master' of github.com:devbridge/BetterCMS into dev
Merge branch 'dev' of github.com:devbridge/BetterCMS into dev
#537 fixed
Merge branch 'dev' of github.com:devbridge/BetterCMS into dev