consolidated service handlers into user_controller
Merge branch 'master' of https://github.com/aaliang/rykjvk
test client changes