Added Maestro Messages
Merge branch 'master' of github.com:dalers/maestro

Conflicts:
	scc/web/index.html