Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/minyisoft/webapp/core/persistence/ICacheableDao.java
Merge branch 'master' of https://github.com/oqy/webapp-core.git