a little test
Merge remote-tracking branch 'origin/master' into unHealthy
818code
Merge pull request #1 from unhealthy/master

Master
merge down and begin my code
test egit
Clear the code of zxing
Merge from master
Merge remote-tracking branch 'origin/unHealthy'

Conflicts:
	res/layout/activity_friend.xml
	res/layout/activity_nfcpayment.xml
	res/layout/camera.xml
	src/com/billme/logic/MainService.java
	src/com/billme/ui/BaseActivity.java
	src/com/billme/ui/FriendActivity.java
	src/com/billme/ui/NFCPaymentActivity.java
	src/com/billme/ui/PaymentActivity.java
	src/com/billme/ui/PaymentConfirmActivity.java
	src/com/futurePayment/constant/ServiceType.java
	src/com/futurePayment/constant/Task.java
	src/com/futurePayment/http/MyHttpClient.java
	src/com/futurePayment/model/Friend.java
	src/com/futurePayment/model/FuturePaymentSupport.java
	src/com/futurePayment/model/RegistInformation.java
	src/com/futurePayment/model/Transfer.java
	src/com/futurePayment/model/User.java
	src/com/zxing/activity/CaptureActivity.java
	src/com/zxing/camera/CameraConfigurationManager.java
	src/com/zxing/camera/CameraManager.java