refactor code
Merge branch 'master' of https://github.com/zjjgogogo/DemoForCamera

Conflicts:
	src/com/example/demoforcarmera/DemoForCarmera.java