Merge branch 'master' of https://github.com/Wyyrlok/jgaviation.git