Remove unused PLY face property.
Make computation of the intrinsic id simpler. #174
remove hardcoded OpenCV_DIR
get rid of msvc warnings about macro redefinition (_CRT_SECURE_NO_WARNINGS)
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	src/software/SfM/SfMIOHelper.hpp