contract flow completed

By St 2014-11-13 15:29
Merge origin/master

Conflicts:
	ES09-MerLION-ejb/src/java/WMS/Entity/WMSServiceCatalog.java
2014-11-13 15:48