added username to users model
merged master into username