color, 크기 보정
Merge branch 'master' of https://github.com/Cocktailor/android.git

Conflicts:
	CockTailor/bin/CockTailor.apk
	CockTailor/bin/classes.dex
	CockTailor/bin/resources.ap_