...
Merge branch 'wing' of github.com:sookee/oa-mod

Conflicts:
	oa-0.8.8/code/game/g_vote.c