added user controller and started user routes
Merge branch 'master' of https://github.com/websociety/project-manager
added resource route
fixed conflict