Django 1.7.1
Django 1.7.1
Merge branch 'django-1.7' of github.com:ccnmtl/tala into django-1.7
Merge pull request #2 from ccnmtl/django-1.7

Django 1.7