finished api and user class
fixed fails from last commit
Merge branch 'dev'