#381: tabs updated.
Merge branch 'dev' of github.com:devbridge/BetterCMS into dev