Fixing https://bugzilla.redhat.com/show_bug.cgi?id=1013886
Merge remote-tracking branch 'origin/Development' into Development

Conflicts:
	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/common/AlertBox.java
Fixing https://bugzilla.redhat.com/show_bug.cgi?id=1013886