Merge branch 'hotfix/CX-134'
TE-2 fixed
Merge branch 'hotfix/TE-2' into develop

Conflicts:
	Struts_2/src/ApplicationResources.properties