fixed strip overlap
Merge branch 'master' of https://github.com/geoin/ControlloVoliRT
Merge branch 'master' of https://github.com/geoin/ControlloVoliRT

Conflicts:
	check_photo_fli/photo_exec.cpp