Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/minyisoft/webapp/core/persistence/ICacheableDao.java
t
test
test