GCP-5802
Merge branch 'master' of https://github.com/digitalabs/ETLSample

Conflicts:
	src/main/webapp/WEB-INF/i18n/Messages.properties