user_models and user_api
Merge branch 'new_website' of https://github.com/digitalgreenorg/dg into new_website

Conflicts:
	website/user_models.py