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

Conflicts:
	Struts_2/src/ApplicationResources.properties
Merge branch 'hotfix/DE-12' into develop

Conflicts:
	Struts_2/src/ApplicationResources.properties
FE-123
FG-77 is fixed
NF-1 changes
TE-111 fixed
Merge branch 'release/RE-09'