Java App for colloq -> continued.
Merge branch 'master' of https://github.com/furylynx/MAE

Conflicts:
	samples/SmartHome-Java-Sample/bin/Main/SmartHomeJavaSample.class
	samples/SmartHome-Java-Sample/config.ini
	samples/SmartHome-Java-Sample/src/Main/SmartHomeJavaSample.java