added davis type 4 to Surface class
Merge branch 'dev-piv' into development