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