rebased develop into master
removed get_user_model because of circular imports
added username field
added username update
added username update
added username update
added username update
fixed username update
fixed username update
Merge branch 'master' into develop
merged master into develop