[Wen Hao] - Added Mybatis support.
Merge remote-tracking branch 'origin/master'