water class and test specs completed
water_spec completed
Merge branch 'Development' into ship

Update ship with last commit from Development