add
Merge branch 'master' of https://github.com/DutBright/scientificResearch
modify user model
Merge branch 'master' of https://github.com/DutBright/scientificResearch