updated core dependency to 2.2.0-GA
Remove combined WAR for now
Merge branch 'BroadleafCommerce-3.0.x'

Conflicts:
	pom.xml
Merge remote-tracking branch 'origin/BroadleafCommerce-3.0.x'
Merge tag 'broadleaf-3.0.1-GA'
Merge tag 'broadleaf-3.0.2-GA'
Merge tag 'broadleaf-3.0.3-GA'
Target latest 3.0 version (3.0.4-GA)
Target latest 3.0 snapshot (3.0.5-SNAPSHOT)
Merge tag 'broadleaf-3.0.4-GA'
Target latest 3.0 version (3.0.5-GA)
Target latest 3.0 snapshot (3.0.6-SNAPSHOT)
Merge tag 'broadleaf-3.0.5-GA'
#42 - Respect the ‘DEACTIVATED’ flag on Customer for Spring Security
#43 - Provide a better OOB configuration for salting user passwords in Spring Security
Merge branch 'BroadleafCommerce-3.0.x' into develop

Conflicts:
	pom.xml
updates
update cache settings
Remove limits on the length of a promo code input
Remove warnings in site’s build.xml