moved forms to a separate directory; fixed a bug in a form; identified extraneous cells in the table
Merge branch 'master' into work

Conflicts:
fixed (hopefully) branch differences