Added basic gui elements and working combo box
Attempting to fix merge failure
Merge Repairs
Merge branch 'master' of https://github.com/fahslaj/maestro_2014