ok
Merge branch 'master' of github.com:github15693/rms
chang in user model
Merge branch 'master' of github.com:github15693/rms