user edit profile
Merge branch 'master' of http://github.com/zj831007/ThreeK

user model