Merge branch 'master' into ale

Conflicts:
	JadeHomeAutomation/src/com/jadehomeautomation/agent/SampleController.java
	
I don't know if it has worked properly
Merge remote-tracking branch 'origin/master'