user render imp
Merge remote-tracking branch 'origin/master'

Conflicts:
	devdays/devdays_app/users/views.py
	devdays/devdays_app/views.py