Upgraded to BLC version 2.1
Added data-driven SEO properties to Page.
Modified template to include SEO properties; included sample SEO properties on some Categories and Products.
Added content/default to the BroadleafThymeleafViewResolver layoutMap to handle calls by Structured Content Pages by the default.html page.
Implemented the new blc img tag that will use the img name as default alt text if none is provided.
Merge remote-tracking branch 'remotes/origin/BroadleafCommerce-2.0.x' into BroadleafCommerce-2.1.x
Merge remote-tracking branch 'remotes/origin/BroadleafCommerce-2.0.x' into BroadleafCommerce-2.1.x
Fixed ant tasks to generate updates for database schemas
Prepended "ant" to the property names for the ant properties.
Merge remote-tracking branch 'origin/BroadleafCommerce-2.0.x' into BroadleafCommerce-2.1.x
Updated applicationContexts to have all BLC component scanning done within BLC applicationContexts
Made SEO properties an embeddable table in ProductImpl.
Made SEO properties an embeddable table in CategoryImpl.
remove SEO fields from import sql
Merge remote-tracking branch 'origin/BroadleafCommerce-2.1.x' into BroadleafCommerce-2.1.x

Conflicts:
	site/build.xml
update dependency
Added solr and hsql output for the combined artifact to .gitignore
Merge branch 'BroadleafCommerce-2.0.x' into BroadleafCommerce-2.1.x
Merge branch 'BroadleafCommerce-2.1.x' into develop. The only change
brought over was the .gitignore because the 2.1 branch has a fair amount
of SEO changes that are no longer relevant.

Conflicts:
	core/src/main/resources/sql/load_content_data.sql
	core/src/main/resources/sql/load_content_structure.sql
	pom.xml
	site/src/main/webapp/WEB-INF/templates/catalog/partials/rightHandBannerAds.html
	site/src/main/webapp/WEB-INF/templates/checkout/partials/shippingInfoForm.html
	site/src/main/webapp/WEB-INF/templates/layout/home.html
	site/src/main/webapp/WEB-INF/templates/layout/partials/footer.html
updating pom to 2.3.0-SNAPSHOT