uwaaa
Merge branch 'master' of https://github.com/TechCAMP2013/cyber

Conflicts:
	bin/classes/ya/example/manga4/DrawActivity.class
	bin/classes/ya/example/manga4/SelectColorActivity.class