Removed empty id (for valid HTML)
Merge branch 'dev' of github.com:devbridge/BetterCMS into dev