Adding MSO Manager and Message in Webapp
Adding MSO to webapp
Capitalising first letter and fixing Zone names
Removing MSO debug
Merge branch 'master' of
git@github.com:robbutcher2001/home-automation.git

Conflicts:
	HomeAutomationEngine/src/co/uk/rob/apartment/automation/controller/BedroomOneController.java