Finished user model
Fixed api urls
Merged in master