14-06-27
Merge branch 'master' of https://github.com/joymaker2014/actnow.git

Conflicts:
	ActionNow/src/main/java/com/jm/client/WeixinClient.java
	ActionNow/src/main/resources/META-INF/persistence.xml
Merge branch 'master' of https://github.com/joymaker2014/actnow.git

Conflicts:
	ActionNow/src/main/resources/META-INF/persistence.xml
添加了GoodsType
mzl
Merge branch 'master' of https://github.com/joymaker2014/actnow.git

Conflicts:
	ActionNow/pom.xml
	ActionNow/src/main/java/com/jm/communication/request/EventRequest.java
	ActionNow/src/main/java/com/jm/constants/request/TextContents.java
	ActionNow/src/main/java/com/jm/dao/GoodsDao.java
	ActionNow/src/main/java/com/jm/service/GoodsServiceImpl.java
	ActionNow/src/main/java/com/jm/service/spi/GoodsService.java
	ActionNow/src/main/java/com/jm/util/ServiceUtils.java
	ActionNow/src/main/resources/META-INF/persistence.xml
	ActionNow/src/main/resources/META-INF/spring/app-context.xml