Merge branch 'master' into vtk6.0_compatible

TraVisTo.pro

forms/Settings.h

src/Frame.cpp

src/IO/OutputHandler.cpp

src/IO/OutputHandler.h

src/IO/TraVisToClient.cpp

src/IO/TraVisToClient.h

src/InteractorStyle.cpp

src/Pedestrian.cpp

src/Pedestrian.h

src/SaxParser.cpp

src/SaxParser.h

src/ThreadVisualisation.cpp

src/ThreadVisualisation.h

src/TimerCallback.cpp

src/extern_var.h

src/general/Macros.h

src/geometry/Building.cpp

src/geometry/Building.h

src/geometry/Crossing.cpp