bin冲突
Merge branch 'master' of https://github.com/dongrenguang/LoveCall.git

Conflicts:
	bin/AndroidManifest.xml
	bin/LoveCall.apk
	bin/R.txt
	bin/classes.dex
	bin/classes/.gitignore
	bin/classes/android/support/v7/appcompat/R$layout.class
	bin/classes/com/example/loveCall/R$attr.class
	bin/classes/com/example/loveCall/R$bool.class
	bin/classes/com/example/loveCall/R$color.class
	bin/classes/com/example/loveCall/R$dimen.class
	bin/classes/com/example/loveCall/R$drawable.class
	bin/classes/com/example/loveCall/R$id.class
	bin/classes/com/example/loveCall/R$integer.class
	bin/classes/com/example/loveCall/R$layout.class
	bin/classes/com/example/loveCall/R$menu.class
	bin/classes/com/example/loveCall/R$string.class
	bin/classes/com/example/loveCall/R$style.class
	bin/classes/com/example/loveCall/R$styleable.class
	bin/classes/com/example/loveCall/R.class
	bin/classes/loveCall/activity/AddReminderActivity.class
	bin/classes/loveCall/activity/MainActivity.class
	bin/classes/loveCall/activity/SpecialPersonActivity$1.class
	bin/classes/loveCall/activity/SpecialPersonActivity.class
	bin/classes/loveCall/activity/time/EveryDayActivity.class
	bin/classes/loveCall/activity/time/EveryMonthActivity.class
	bin/classes/loveCall/activity/time/EveryWeekActivity.class
	bin/classes/loveCall/activity/time/OnlyOnceActivity.class
	bin/classes/loveCall/adapter/SpecialPersonAdapter.class
	bin/jarlist.cache
	bin/resources.ap_