First steps to commit modifications
Merge with François

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/services/workflows/WorkflowService.scala