Changement historique pour ManyToMany Correction de WTF dans Capteur.java
Changerment Historique
Merge branch 'master' of https://github.com/h4414/ghome

Conflicts:
	src/main/java/h4414/ghome/entities/Condition.java
	src/main/java/h4414/ghome/entities/ConditionPresence.java
	src/main/java/h4414/ghome/entities/ConditionTemperature.java
	src/main/java/h4414/ghome/entities/Historique.java

	new file:   src/main/java/h4414/ghome/entities/ConditionContacteur.java
	modified:   src/main/java/h4414/ghome/entities/ConditionPresence.java
	modified:   src/main/java/h4414/ghome/entities/ConditionTemperature.java
	new rile:   src/main/java/h4414/ghome/entities/ConditionTemps.java
	modified:   src/main/java/h4414/ghome/entities/EmploiTemps.java
	modified:   src/main/java/h4414/ghome/entities/Historique.java
	modified:   src/main/java/h4414/ghome/entities/PlageHoraire.java
	new file:   src/main/java/h4414/ghome/entities/RegleCondition.java
	modified:   src/main/java/traitement/Contacteur.java
	modified:   src/main/resources/META-INF/persistence.xml
	new file:   src/main/webapp/html/comboboxRegles.html
	new file:   src/main/webapp/html/conditionPresence.html
	new file:   src/main/webapp/html/conditionTemperature.html
	new file:   src/main/webapp/html/css/regles.css
	modified:   src/main/webapp/html/regles.html