Projects commented
Merge branch 'master' of
https://github.com/bgrosskleg/HomeAutomation.git

Conflicts:
	BaseStation/src/controller/BaseStationController.java