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

Conflicts:
	bin/classes/com/app/catherine/R$drawable.class
	bin/classes/com/app/catherine/R$id.class
	bin/classes/com/app/catherine/R$layout.class
	bin/classes/com/app/catherine/R$menu.class
	bin/classes/com/app/catherine/R$string.class
	bin/classes/com/app/catherine/R$style.class
	bin/classes/com/app/catherine/Start.class
	gen/com/app/catherine/R.java