Update develop to use Broadleaf version 3.1.0-SNAPSHOT
Merge remote-tracking branch 'origin/BroadleafCommerce-3.0.x' into develop
Merge branch 'BroadleafCommerce-3.0.x' into develop

Conflicts:
	pom.xml
Merge remote-tracking branch 'remotes/origin/BroadleafCommerce-3.0.x' into develop
Merge remote-tracking branch 'origin/BroadleafCommerce-3.0.x' into develop
add spring instrument jar wrapper targets for sql targets
task cleanup
Allow build-create-sql and build-update-sql tasks to run when weaved classes are present
Merge remote-tracking branch 'remotes/origin/BroadleafCommerce-3.0.x' into develop
Allow build-create-sql and build-update-sql tasks to run when weaved classes are present
Merge remote-tracking branch 'origin/BroadleafCommerce-3.0.x' into develop
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
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
Moved the blJsFileMap and blResourceBundlingService back out to DemoSite to allow others to add to them.
#182
allow product options to be updated after item in cart
#193. Added support to demo site for updating the fulfillment option.
Added internationalized error messages that are returned from REST services.
Add reference to handlers list
Update some resource locations, upgrade jQuery library
fix combine identifiers