sync test
sync test

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