【2014-12-24 13:43】fixed project
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/dsnx/business/payment/wxpay/WxpayConstan.java