Merge remote-tracking branch 'origin/Development' into Development

Conflicts:
	src/main/java/org/jboss/pressgang/ccms/ui/client/local/constants/Constants.java