Updated maven dependencies
Merge branch 'Development2' into DevelopmentHelpOverlay

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