Merge branch 'master' of https://github.com/Noterik/smt_euscreenxlitem

Conflicts:
	WebContent/WEB-INF/lib/smt_euscreenxlitemapp.jar
	WebContent/eddie/apps/euscreenxlitem/actionlists/itempage.maf
Merge with Daniel