drawable만 바꿈
yg
Merge branch 'maymay'

Conflicts:
	bin/classes/club/sgen/crop/PictureSelector.class
	bin/classes/club/sgen/network/R$attr.class
	bin/classes/club/sgen/network/R$dimen.class
	bin/classes/club/sgen/network/R$drawable.class
	bin/classes/club/sgen/network/R$id.class
	bin/classes/club/sgen/network/R$layout.class
	bin/classes/club/sgen/network/R$menu.class
	bin/classes/club/sgen/network/R$string.class
	bin/classes/club/sgen/network/R$style.class
	bin/classes/club/sgen/network/R.class
	bin/classes/club/sgen/test/BettingMakeActivity.class
	bin/classes/club/sgen/test/ImageDownloadTestActivity.class
	bin/classes/club/sgen/test/MainActivity.class
	bin/resources.ap_
	gen/club/sgen/network/R.java
	res/anim/push_right_in.xml
	res/anim/push_right_out.xml
As
Merge remote-tracking branch 'origin/master'
asdf
sfd