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'
Merge tag 'broadleaf-3.0.4-GA'
Merge tag 'broadleaf-3.0.5-GA'
Changing productOffset & subcategoryOffset to "0" instead of "1"

Default offset should be 0 instead of 1 which omits the first product/sub-category from the API endpoint
Merge pull request #44 from xshyamx/patch-2

Changing productOffset & subcategoryOffset to "0" instead of "1"
Merge branch 'master' into BroadleafCommerce-3.0.x to get pull request changes
Target latest 3.0 version (3.0.6-GA)
Target latest 3.0 snapshot (3.0.7-SNAPSHOT)
Merge branch 'BroadleafCommerce-3.0.x' into develop

Conflicts:
	pom.xml