Fixed some merge errors.
Merge branch 'Development2' of github.com:pressgang-ccms/PressGangCCMSUI into Development2

Conflicts:
	src/main/java/org/jboss/pressgang/ccms/ui/client/local/constants/Constants.java
	src/main/java/org/jboss/pressgang/ccms/ui/client/local/mvp/presenter/base/BaseTemplatePresenter.java
	src/main/java/org/jboss/pressgang/ccms/ui/client/local/mvp/view/base/BaseTemplateView.java