Merge branch 'master' of github.com:mcd1992/gmsv_fgt_navstuff