added views and templates for the django project
Merge branch 'master' into make-django-work
make the project work on django