Two minor bug fixes exposed by Linux/Jenkins.
Serious bug in vident.cpp, including package.cpp! Fixed and the correct includes added.
Clashing name fixed.
Fixed missing include file (again exposed by Linux).
Merge remote-tracking branch 'origin/master' into gvmtest

Conflicts:
	apps/gvmtest/cpp/gvmtest.cpp
Fix missing public: section in MapObject.