setting
Merge branch 'master' of https://github.com/centsol/CameraPic

Conflicts:
	src/com/centsol/campic/SaveImage.java
Merge branch 'master' of https://github.com/centsol/CameraPic

Conflicts:
	src/com/centsol/campic/SaveImage.java