[Wen Hao] - Added mapper for Mybatis and updated database schema.
Merge remote-tracking branch 'origin/master'