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

Conflicts:
	samples/SmartHome-Java-Sample/src/View/RegisteredMovementsPanel.java
____________________________

Java App for colloq -> continued.