building forms
Merge branch 'controllers'

Building forms for units and buidlings, round 1