before merging with XC
Before merging
Merge branch 'master' of https://github.com/xc4330/Manon

Conflicts:
	IRMS-ejb/dist/IRMS-ejb.jar
	IRMS-war/dist/IRMS-war.war
	build/IRMS-ejb.jar
	build/IRMS-war.war
	dist/IRMS.ear
	dist/gfdeploy/IRMS/IRMS-war_war/index.xhtml
New ignore setting