Signed-off-by: wuxii <wuxii@foxmail.com>
Merge branch 'spring' of ssh://git@github.com/wuxii/moon.git into spring

Conflicts:
	moon-projects/moon-ii/src/main/java/org/moon/ii/dao/BaseJpaDao.java
	moon-projects/moon-ii/src/main/resources/applicationContext.xml