#234 added logic to avoid duplication.
Merge branch 'dev' of github.com:devbridge/BetterCMS into dev