huge modification
commit for merge
Merge remote-tracking branch 'origin/unHealthy'

Conflicts:
	gen/com/billme/ui/R.java
	src/com/billme/logic/MainService.java
	src/com/billme/ui/BaseActivity.java
	src/com/billme/ui/NFCPaymentActivity.java
	src/com/billme/ui/PaymentActivity.java
	src/com/billme/util/DateUtil.java
	src/com/futurePayment/constant/Task.java
	src/com/futurePayment/model/User.java
	src/com/zxing/encoding/EncodingHandler.java