Erreur de constante
Merge branch 'master' of https://github.com/IA04Group/SmartHouse.git

Conflicts:
	src/smarthouse/autoswitchagent/AutoSwitchRequestsBehaviour.java