.
Merge branch 'master' of https://github.com/iamabook/java57.git

Conflicts:
	Camera/bin/classes/com/lightbox/android/camera/edit/Edit.class