Merge branch 'master' of github.com:kjayma/surveyor_gui