crate i18n branch
fix combined
fix combined
fix combined
use .com package
clean up pom
shorten the table names
shorten the table names
refactor i18n packages
Merge remote-tracking branch 'origin/develop' into example-i18n

Conflicts:
	.gitignore
	admin/src/main/resources/messages-admin.properties
	core/src/main/resources/sql/load_admin_security.sql
	core/src/main/resources/sql/load_catalog_data.sql
	core/src/main/resources/sql/load_catalog_international_data_ES.sql
	core/src/main/resources/sql/load_catalog_international_data_FR.sql
	core/src/main/resources/sql/load_content_structure.sql
	core/src/main/resources/sql/load_content_structure_international.sql
	site/src/main/resources/runtime-properties/development.properties
using jpa transformation
modules should be enabled
adding place holder file for i18n
Replace tabs with spaces
Merge remote-tracking branch 'origin/upstream-I18n-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
	admin/src/main/webapp/WEB-INF/log4j.xml
	admin/src/main/webapp/WEB-INF/web.xml
	build.properties
	combined/build.xml
	combined/pom.xml
	combined/src/main/webapp/WEB-INF/web.xml
	core/pom.xml
	core/src/main/resources/sql/import_storage.sql
	core/src/main/resources/sql/load_admin_security.sql
	core/src/main/resources/sql/load_catalog_data.sql
	core/src/main/resources/sql/load_content_structure_international.sql
	pom.xml
	site/build.xml
	site/pom.xml
	site/src/main/resources/runtime-properties/development.properties
	site/src/main/resources/runtime-properties/local.properties
	site/src/main/webapp/WEB-INF/applicationContext-filter.xml
	site/src/main/webapp/WEB-INF/log4j.xml
	site/src/main/webapp/WEB-INF/web.xml