s
commit
Merge branch 'master' of https://github.com/TuomingZheng/wang-nfc

Conflicts:
	PostCard/bin/AndroidManifest.xml
	PostCard/bin/PostCard.apk
	PostCard/bin/classes.dex
	PostCard/bin/classes/com/nfc/wang/postcard/R$id.class
	PostCard/bin/classes/com/nfc/wang/postcard/R$string.class
	PostCard/bin/classes/com/nfc/wang/postcard/R$style.class
	PostCard/bin/classes/com/yigao/nfc/postcard/ui/activity/PostCardMainActivity.class
	PostCard/bin/classes/com/yigao/nfc/postcard/ui/adapter/ContactCompanyAdapter.class
	PostCard/bin/classes/com/yigao/nfc/postcard/ui/adapter/ContactEmailAdapter.class
	PostCard/bin/classes/com/yigao/nfc/postcard/ui/adapter/ContactMobileAdapter.class
	PostCard/bin/classes/com/yigao/nfc/postcard/ui/fragment/PostCardDetailsFragment.class
	PostCard/bin/classes/com/yigao/nfc/postcard/ui/fragment/PostCardEditableFragment.class
	PostCard/bin/classes/com/yigao/nfc/postcard/ui/view/DropDownLayout.class
	PostCard/bin/dexedLibs/android-support-v4-4499981a8d4df5e0d9d5ad39d7abcaf7.jar
	PostCard/bin/resources.ap_
	PostCard/gen/com/nfc/wang/postcard/R.java
	PostCard/res/values/strings.xml
'代码提错了'