Camera modified
Merge branch 'master' of github.com:youpony/aMuse-android

Conflicts:
	src/com/youpony/amuse/CameraTab.java
	src/com/youpony/amuse/ImagePreview.java