use new shot manager and node models
Merge branch 'drf'
Merge pull request #1 from dpretty/master

Merge django-rest-framework branch