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'
Allow build-create-sql and build-update-sql tasks to run when weaved classes are present
(cherry picked from commit 4d3870d)
Allow build-create-sql and build-update-sql tasks to run when weaved classes are present
(cherry picked from commit 11156c5)
Allow build-create-sql and build-update-sql tasks to run when weaved classes are present
Allow build-create-sql and build-update-sql tasks to run when weaved classes are present
Moved CSS and JS resouce definitions in the core so that clients or modules can easily add resources to the list using a late stage post processor
(cherry picked from commit eb1a02e5c26a6a1e9881755bebdd0ddd2af77499)
Moved list definitions around to specifically allow the appropriate BLC module to add its resources to the list rather than having everything defined in open admin
(cherry picked from commit 8e67e73178dd5d2787c777aa36f9150db9de706f)
Moved the blJsFileMap and blResourceBundlingService back out to DemoSite to allow others to add to them.
(cherry picked from commit 53fe657780ccea157844d41e036bea13c7f4f7c0)
#193. Added support to demo site for updating the fulfillment option.(cherry picked from commit e43cfecd525cef539dcd73e1d9c176d11e910cc4)
Target latest 3.0 GA
Merge tag 'broadleaf-3.0.1-GA'
Merge remote-tracking branch 'upstream/master' into BroadleafCommerce-3.0.x