Fixing Django-1.5 related view issues, started porting to djangorestframework 2.x
Merge branch 'master' of git+ssh://github.com/micolous/tollgate