Merge with Vincent, add workflow steps
Merge with Vincent, add workflow steps (oups)
Merge with François

Conflicts:
	rudder-web/src/main/scala/bootstrap/liftweb/AppConfig.scala
	rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveEditForm.scala
	rudder-web/src/main/scala/com/normation/rudder/web/components/popup/ModificationValidationPopup.scala