User management
Merge remote-tracking branch 'origin/master'

Conflicts:
	smrpo3/settings.py
	webapp/forms.py
	webapp/urls.py
	webapp/views.py