New user profile and edit profile views
Merge branch 'master' of github.com:magnet-cl/django-project-template

Conflicts:
	fabfile/project.py