Composant Regulation Lumiere - Vincent
Merge branch 'master' of https://github.com/ESIR3-NSOC/NSOC-2012

Conflicts:
	esir.dom12.nsoc.regulation/src/main/java/esir/dom12/nsoc/regulation/RegulationComponent.java
Merge branch 'master' of https://github.com/ESIR3-NSOC/NSOC-2012