gui skeleton and db saves
Merge branch 'master' of https://github.com/mlsglobal/controller
merging branches