Merge https://github.com/Elecner/finalfrontier
Added fix for possible error in sgui/lifesupport
Merge branch 'master' of https://github.com/finalfrontier/finalfrontier
Merge branch 'origin/master'