User model updated
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu
User Update and Add option changed.
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu