Replace tabs with spaces
Replace tabs with spaces
Fix erroneous create-drop statement
Upgrade to version 2.0.6 of Broadleaf
Fix pager style
Merge branch 'BroadleafCommerce-2.0.x' into BroadleafCommerce-2.1.x

Conflicts:
	pom.xml
	site/build.xml
	site/src/main/webapp/WEB-INF/applicationContext-servlet.xml
	site/src/main/webapp/WEB-INF/templates/content/default.html
	site/src/main/webapp/WEB-INF/templates/layout/partials/head.html
	site/src/main/webapp/css/style.css
Upgrade to version 2.1.2 of Broadleaf
Upgrade Lucene indexer, request handlers for Solr
Merge branch 'BroadleafCommerce-2.0.x' into BroadleafCommerce-2.1.x
Merge branch 'BroadleafCommerce-2.1.x'

Conflicts:
	pom.xml
	site/src/main/resources/schema.xml
	site/src/main/resources/solrconfig.xml
	site/src/main/webapp/css/style.css