preparing for github
Merge branch 'master' of https://github.com/ansal/django_oauth_demo