Merge pull request #696 from hegek87/havoc

Switched from ngRoute to ui-router
Merge remote-tracking branch 'upstream/havoc' into havoc