tt
Merge branch 'master' of https://github.com/dongrenguang/LoveCall

Conflicts:
	bin/LoveCall.apk
	bin/R.txt
	bin/classes.dex
	bin/classes/loveCall/activity/MainActivity.class
	bin/resources.ap_