minor changes
Merge branch 'opengl2-rendering' of https://github.com/cryos/VTK into opengl2-rendering
Merge branch 'opengl2-rendering' of https://github.com/cryos/VTK into opengl2-rendering
some bug fixes and start on mapper2D