zzzz
zz
zz
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/edit/Edit$1.class
	Camera/bin/classes/com/lightbox/android/camera/edit/Edit$2.class
	Camera/bin/classes/com/lightbox/android/camera/edit/Edit$3.class
	Camera/bin/classes/com/lightbox/android/camera/edit/Edit.class
	Camera/bin/classes/com/lightbox/android/camera/edit/MoveObject.class
	Camera/bin/resources.ap_
	Camera/src/com/lightbox/android/camera/edit/Edit.java
	Camera/src/com/lightbox/android/camera/edit/MoveObject.java