Updated Makefile for osrm.* files.
Fixes to Makefiles for libjson and curlpp libraries.
Merge branch 'vdev' into develop

Conflicts:
	baseClasses/Makefile