Updates gui launch, fixes map input
Merge branch 'master' of https://github.com/gkanwar/rss-team-6