conflict
Merge branch 'master' of https://github.com/wjling/Catherine.git

Conflicts:
	bin/classes/com/app/catherine/R$style.class
	res/layout/menu_friends_center.xml