remove category from users model
add categories model, fix bugs
Merge branch 'master' of https://github.com/thedeps/dev