merged from branch 'rigid registration tool' R147:292.
Tested compile+run: XCode/clang 6 (Mac OS X 10.10.4, VTK 5.10, ITK 4.7, Qt 4.8.6 ) MSVS 2015 (Win 7 x64, VTK 5.10.1, ITK 4.8, Qt 4.8.7 ).
Authored by: benjaminbertram 2015-08-22
Parent: [r294]
Child: [r296]