userlogin api function changes
Merge branch 'rock-rest' of https://github.com/NewSpring/newspring-node into rock-rest