mybatis test
Merge branch 'master' of https://github.com/smrwns/blog

Conflicts:
	blog/src/main/resources/datasource.xml
	blog/target/classes/.gitignore
	blog/target/classes/datasource.xml