Done password reset feature
Merge branch 'master' of https://github.com/sureshvtt/entranceapp

Conflicts:
	entrance/entrance/urls.py