Merge branch 'Development2' into Development2-1.1

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/presenter/image/ImagesFilteredResultsAndDetailsPresenter.java
	src/main/java/org/jboss/pressgang/ccms/ui/client/local/mvp/presenter/search/topic/TopicSearchTagsFieldsAndFiltersPresenter.java
	src/main/java/org/jboss/pressgang/ccms/ui/client/local/mvp/presenter/topic/searchresults/topics/TopicFilteredResultsAndDetailsPresenter.java
	src/main/java/org/jboss/pressgang/ccms/ui/client/local/mvp/view/base/BaseTemplateView.java
	src/main/java/org/jboss/pressgang/ccms/ui/client/local/mvp/view/base/BaseTemplateViewInterface.java
Merge branch 'Development2-1.1' 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/presenter/file/FilesFilteredResultsAndDetailsPresenter.java
	src/main/java/org/jboss/pressgang/ccms/ui/client/local/mvp/presenter/image/ImagesFilteredResultsAndDetailsPresenter.java
	src/main/java/org/jboss/pressgang/ccms/ui/client/local/mvp/presenter/search/contentspec/ContentSpecSearchTagsFieldsAndFiltersPresenter.java
	src/main/java/org/jboss/pressgang/ccms/ui/client/local/mvp/presenter/search/topic/TopicSearchTagsFieldsAndFiltersPresenter.java
	src/main/java/org/jboss/pressgang/ccms/ui/client/local/mvp/view/base/BaseTemplateView.java
	src/main/java/org/jboss/pressgang/ccms/ui/client/local/mvp/view/base/BaseTemplateViewInterface.java
	src/main/java/org/jboss/pressgang/ccms/ui/client/local/ui/editor/contentspec/RESTTextContentSpecV1BasicDetailsEditor.java
Merge branch 'Development2' of github.com:pressgang-ccms/PressGangCCMSUI into Development2