Ignores intellij error files
Adds Filter by Color
Merge pull request #50 from watermelonjuice/patch-3

Adds Filter by Color
Apply pull request #35 to the appropriate branch
Adds email auth details
Adds email auth details
Merge pull request #53 from watermelonjuice/patch-1

Adds email auth details
Update HSQLDB version.

Fix Issue #55

(cherry picked from commit b1e6e486da00d1cd37c8df63da59f9212461e4ec)
BroadleafCommerce/BroadleafCommerce#543 - Move static assets outside of Spring security
Target latest 3.0 GA (3.0.7-GA)
Target latest 3.0 snapshot (3.0.8-SNAPSHOT)
Make imported sku bundle items not have conflicting primary key values
Merge pull request #49 from watermelonjuice/patch-2

Ignores intellij error files
Target latest 3.0 GA (3.0.8-GA)
Target latest 3.0 snapshot (3.0.9-SNAPSHOT)
#76 - Remove the sql ant tasks
3.0.9 backports for BroadleafCommerce/BroadleafCommerce#629 and BroadleafCommerce/BroadleafCommerce#635
Merge branch 'BroadleafCommerce-3.0.x' into develop

Conflicts:
	admin/src/main/webapp/WEB-INF/applicationContext-admin.xml
	pom.xml
	site/build.xml
	site/src/main/resources/test/applicationContext-load-test.xml
	site/src/main/webapp/WEB-INF/applicationContext-email.xml
	site/src/main/webapp/WEB-INF/applicationContext-security.xml
	site/src/main/webapp/WEB-INF/templates/layout/partials/footer.html