AngularJS sample template fix
Added Tastypie
Merge branch 'master' of https://github.com/jank0s/proris