Merge branch 'master' of github.com:eikeon/marvin
Added state handling via angularjs and websockets.