new
gogogo
Merge branch 'master' of https://github.com/SoftPractice/CardUI

Conflicts:
	CardSyn/gen/com/softwarepractice/cardsyn/R.java
	CardSyn/src/com/softwarepractice/cardsyn/PersonalInfoActivity.java
	CardSyn/src/com/softwarepractice/userdefinedcomponent/ButtonEventOfCardManagerList.java