angularjs integration
Merge branch 'master' of github.com:monkeybros/kaiser

Conflicts:
	src/main.js
readded broadcasts