Template selection fixed.
Merge branch 'dev-contents-drag-and-drop' of ssh://github.com/devbridge/BetterCMS into dev-contents-drag-and-drop