Merge branch 'master' into EigenCamera

CMake/SimMedTKConfig.cmake.in

CMakeLists.txt

examples/renderCubeOculus/main.cpp

examples/renderCubeToTextureOculus/main.cpp

examples/vegaFem/main.cpp

include/smCollision/smCollisionPair.h

include/smCollision/smPlaneCollisionModel.h

include/smContactHandling/smContactHandling.h

include/smContactHandling/smPenaltyContactFemToStatic.h

include/smContactHandling/smPenaltyContactHandling.h

include/smCore/smConfig.h

include/smCore/smErrorLog.h

include/smCore/smSceneObject.h

include/smCore/smSimulator.h

include/smCore/smStaticSceneObject.h

include/smGeometry/smPlaneModel.h

include/smSimulators/smSceneObjectDeformable.h

include/smSimulators/smStylusObject.h

include/smSimulators/smVegaFemSceneObject.h

include/smSimulators/smVegaObjectConfig.h