use .com
use broadleaf-advanced-search-1.1.0 module snapshot for admin3
add new module context file
code cleanup
Merge remote-tracking branch 'upstream-AdvancedSearch/develop' into upstream-AdvancedSearch-develop
Merge remote-tracking branch 'origin/upstream-AdvancedSearch-develop' into admin3

Conflicts:
	admin/build.xml
	admin/pom.xml
	admin/src/main/webapp/WEB-INF/web.xml
	combined/pom.xml
	combined/src/main/webapp/WEB-INF/web.xml
	site/build.xml
	site/src/main/webapp/WEB-INF/web.xml