edit profile and changepass
Merge branch 'master' into password

Conflicts:
	wsgiwars/__init__.py
	wsgiwars/views.py
add profile