Profile editing added

	modified:   app/forms.py
	new file:   app/templates/edit.html
	modified:   app/templates/user.html
	modified:   app/views.py
Merge branch 'master' into new-master