Merge remote-tracking branch 'origin/master'

Conflicts:
	user/templates/register.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	user/templates/register.html