Db Schema changes
Merge branch 'master' of https://github.com/yandizheng/prototype.git