Merge branch 'master' of https://github.com/UnCheon/cashcall_android

Conflicts:
	CashCall/src/com/rhinodream/cashcall/background/BackgroundService.java
ss

ss