Fixed some noquote stuff in form templates, fixed conflicts in default-master caused by the curriculum update and my bracketing of "if" exprs (failure to do so causes Tcl to compile the expr every time)
Changes to how buttons work: Form-builder now takes care of determining which buttons to use, not the template; Added actions functionality to form builder