Spread sheet devel merge into master

Spread sheet form is now done enough that it can be placed on master.