Bug fixes, began creating UI
UI development, Bug fixes

UI development in formbuilder.  Fixed bug in OS detection, dealing with
ssp records with 0 ssp (recorded in error)
Force merge completion