user controller api
angular view user
fix conflict
Merge pull request #12 from me33dy/controller-api

user controller api