Merge branch 'hotfix/TE-2'
DE-12 is fixed
Merge branch 'hotfix/DE-12' into develop

Conflicts:
	Struts_2/src/ApplicationResources.properties