czwang's job
czwang's job
Merge branch 'master' of https://github.com/SoftPractice/CardUI

Conflicts:
	CardSyn/gen/com/softwarepractice/cardsyn/R.java