fix coupon
hehe
Merge branch 'master' into fanzy

Conflicts:
	gen/com/billme/ui/R.java
	src/com/billme/logic/MainService.java
	src/com/billme/ui/BankCardActivity.java
	src/com/billme/ui/CouponActivity.java
	src/com/billme/ui/EnterpriseFragment.java
	src/com/billme/ui/PaymentConfirmActivity.java
	src/com/billme/ui/SearchEnterpriseActivity.java
	src/com/billme/ui/SearchFriendActivity.java
	src/com/futurePayment/constant/Task.java
	src/com/futurePayment/model/FuturePaymentSupport.java
merge
payment testing
lack of the last test
hehe
Merge branch 'fanzy'
Merge remote-tracking branch 'origin/master' into unHealthy

Conflicts:
	gen/com/billme/ui/R.java
	res/layout/activity_main.xml
	src/com/billme/logic/MainService.java
	src/com/billme/ui/TradeRecordActivity.java
	src/com/futurePayment/model/FuturePaymentSupport.java