updating pom to 2.3.0-SNAPSHOT
BLC-801 - updating the Manage Customer Address section to utilize phonePrimary (fixed)
Revert "Implemented the new blc img tag that will use the img name as default alt text if none is provided."

This reverts commit 57420a01fccc8500baae4d869530e2459052c3a5.
BLC-801 - updating Checkout flow to utilize phonePrimary
Merge branch 'develop' into develop-2.3
Merge remote-tracking branch 'origin/develop' into develop-2.3
Replace tabs with spaces
Merge branch 'develop' into develop-2.3
Replace tabs with spaces
Replace tabs with spaces
Replace tabs with spaces
Upgrade to Solr 4.0.0
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