sec commit
加入缓存功能
Merge branch 'master' of https://github.com/wpxidian/ORMapping

Conflicts:
	.settings/org.eclipse.jdt.core.prefs
	README.md
	src/main/java/cn/edu/xidian/dao/DataSource.java
	src/main/java/cn/edu/xidian/dao/ORMapping.java
	src/main/java/cn/edu/xidian/dao/SimpleDataSource.java
	src/main/java/cn/edu/xidian/dao/SimpleHttpServer.java
	src/test/java/cn/edu/xidian/dao/TestSimpleDataSource.java
	target/classes/META-INF/maven/cn.edu.xidian.ORMapping/ORMapping/pom.properties
	target/classes/cn/edu/xidian/dao/ORMapping.class
	target/classes/cn/edu/xidian/dao/Process.class
	target/classes/cn/edu/xidian/dao/SimpleDataSource.class
	target/classes/cn/edu/xidian/dao/SimpleHttpServer.class
	target/test-classes/cn/edu/xidian/dao/TestSimpleDataSource.class