Winform phase 1
Merge branch 'develop' of https://github.com/druiduz/GOS into develop