4
Merge remote-tracking branch 'origin/master'

Conflicts:
	ultamate battle fight/ultamate battle fight.gmx/ultamate battle
fight.project.gmx
5