Update mybatis
Merge branch 'master' of https://github.com/soulmatt/dao into soulmatt
Update hibernate