user_models and user_api
updating
correcting migrations
adding migrations
renaming migration in website
removing interest resource
Merge branch 'new_website' into test_server_alt

Conflicts:
	website/user_api.py
	website/user_models.py