d
email activation
Merge branch 'master' of https://github.com/impact-tenzin/ParkingSector

Conflicts:
	host/user/templates/registration.html