package is public
Merge remote-tracking branch 'origin/upstream-I18n-develop' into develop

Conflicts:
	admin/src/main/resources/com/mycompany/gwt/mycompanyAdmin.gwt.xml