Merge pull request #646 from jnarron/havoc

Started porting Backbone.js code to AngularJS
Merge remote-tracking branch 'upstream/havoc' into havoc