update user api
Merge branch '20130909'