Minor updates
Merge branch 'load_custom_3d_model' of https://github.com/blefaudeux/PTAM-GPL into load_custom_3d_model

Conflicts:
	libPTAM/src/AssimpRenderer.cc
	libPTAM/src/VideoSource_Linux_V4L.cc