changing password change UI
Merge branch 'master' of https://github.com/ravikirandutta/BOLG

Conflicts:
	takeaway/templates/profile.html