merge from dave
small fixes
merge joe's
add virtual get functions for transformation
trans
merge form joe
line transform
merge from dave
fix conflicts
merge from joe
bug fixes
bug fixes
change in line.cpp
Correct virtual function
test start end
Merge from Albert