Merge master into next

Change-Id: I2178b3a7b85671f230808c7f8b63b892f763718f
Merge topic '0015144_subticks_marks_deactivation' into next

f70b370a Add an option to enble/disable subtick marks of the color bar.
Merge topic '0015141_add_rotation_factor' into next

cf21703a Add a rotation factor to improve 3D manipulation of long objects
Update VTK.

Change-Id: Ia837fe8337ae13cd09eba1b65247c1db1fad984a
Merge topic 'vtk_20141122' into next

f292aa02 Update VTK.