Merge remote-tracking branch 'origin/upstream-admin3' into develop

Conflicts:
	admin/src/main/resources/com/mycompany/gwt/mycompanyAdmin.gwt.xml
	site/build.xml
Merge remote-tracking branch 'upstream-AdvancedSearch/develop' into upstream-AdvancedSearch-develop

Conflicts:
	site/build.xml