commit for pull
commit for pull
Merge branch 'master' of https://github.com/leekyungme/seereal

Conflicts:
	bin/classes/com/sgen/seereal/CameraActivity$4.class
	bin/classes/com/sgen/seereal/CameraActivity.class
	bin/classes/com/sgen/seereal/GalleryActivity.class
	bin/classes/com/sgen/seereal/R$id.class
	bin/classes/com/sgen/seereal/R$layout.class
	bin/classes/com/sgen/seereal/R$menu.class
	bin/classes/com/sgen/seereal/R$string.class
	bin/classes/com/sgen/seereal/R$style.class
	gen/com/sgen/seereal/R.java