fixed 'flag disappearing bug'
Merge branch 'wing' of github.com:sookee/oa-mod into wing