#234 changed logic.
Merge branch 'dev' of github.com:devbridge/BetterCMS into dev