platform
Merge branch 'master' of
https://github.com/yangchenjava/com.yangc.platform.git

Conflicts:
	src/main/resources/jdbc.properties