Merge origin/master

Conflicts:
	ES09-MerLION-war/nbproject/project.properties
Merge origin/master

Conflicts:
	ES09-MerLION-war/nbproject/build-impl.xml
	ES09-MerLION-war/nbproject/genfiles.properties
	ES09-MerLION-war/nbproject/project.properties
	ES09-MerLION-war/nbproject/project.xml