Bocom s5pv210 camera
Merge branch 'master' of github.com:lujiefeng/bocom_camera

Conflicts:
	.gitignore
解决冲突