project.properties updated
Merge origin/master
add wmsOrdersessionbean
Merge origin/master

Conflicts:
	ES09-MerLION-ejb/nbproject/project.properties
	ES09-MerLION-war/nbproject/project.properties
	nbproject/project.properties
20141019 13:56
Merge origin/master
modify feedback entity