merge
Merge remote-tracking branch 'origin/war' into development

Conflicts:
	e-ECG-ejb/nbproject/build-impl.xml
	e-ECG-ejb/nbproject/genfiles.properties
	e-ECG-ejb/nbproject/private/private.properties
	e-ECG-ejb/nbproject/project.properties
	e-ECG-ejb/nbproject/project.xml
	e-ECG-war/nbproject/private/private.properties
	e-ECG-war/nbproject/project.properties
	nbproject/project.properties