Fixed a long outstanding bug with outputs, added a new control type
Fixed conflicts
Merge branch 'GUI' of github.com:David-Parker/API-Builder into GUI