User creation and email activation done
User creation and email activation done
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	apps/usersystem/forms.py
	apps/usersystem/urls.py
	templates/usersystem/register.html