commit1 By St Oct 30th 1
Merge origin/master

Conflicts:
	ES09-MerLION-war/nbproject/project.properties
	nbproject/project.properties
pull 1 By st 2014-10-30