zf
Merge branch 'master' of https://github.com/cedricve/raspicam

Conflicts:
	src/private_still/private_still_impl.h