Add necessary advanced search integration to appear in the admin
needed for project setup, adding a blank directory
Replace tabs with spaces
Merge remote-tracking branch 'origin/upstream-develop' into develop

Conflicts:
	admin/pom.xml
	admin/src/main/webapp/WEB-INF/applicationContext-admin-security.xml
	pom.xml
	site/src/main/webapp/WEB-INF/templates/catalog/product.html
Merge remote-tracking branch 'upstream-AdvancedSearch/develop' into develop

Conflicts:
	admin/build.xml
	admin/pom.xml
	admin/src/main/resources/com/mycompany/gwt/mycompanyAdmin.gwt.xml
	admin/src/main/resources/messages-admin.properties
	combined/build.xml
	site/build.xml
	site/src/main/resources/runtime-properties/local.properties