이름다바꿈
전부다
1818
Merge branch 'master' of https://github.com/iamabook/java57.git

Conflicts:
	Camera/bin/Camera.apk
	Camera/bin/classes.dex
	Camera/bin/classes/com/lightbox/android/camera/OnScreenHint.class
	Camera/bin/classes/com/lightbox/android/camera/R$id.class
	Camera/bin/classes/com/lightbox/android/camera/R$layout.class
	Camera/bin/classes/com/lightbox/android/camera/R$menu.class
	Camera/bin/classes/com/lightbox/android/camera/R$string.class
	Camera/bin/classes/com/lightbox/android/camera/R$style.class
	Camera/bin/classes/com/lightbox/android/camera/R$styleable.class
	Camera/bin/classes/com/lightbox/android/camera/R$xml.class
	Camera/bin/classes/com/lightbox/android/camera/edit/Edit$1.class
	Camera/bin/classes/com/lightbox/android/camera/edit/Edit$2.class
	Camera/bin/classes/com/lightbox/android/camera/edit/Edit.class
	Camera/bin/classes/com/lightbox/android/camera/edit/MovingUnit.class
	Camera/bin/classes/com/lightbox/android/camera/edit/NewQAAdapter.class
	Camera/bin/classes/com/lightbox/android/camera/edit/QuickAction.class
	Camera/bin/classes/com/lightbox/android/camera/firstpage/Toolbar.class
	Camera/bin/res/crunch/drawable-hdpi/red1.png
	Camera/bin/resources.ap_
	Camera/gen/com/lightbox/android/camera/R.java
	Camera/res/drawable-hdpi/red1.png
	Camera/res/layout/edit.xml
	Camera/src/com/lightbox/android/camera/edit/Edit.java
	Camera/src/com/lightbox/android/camera/edit/MoveObject.java