Some fighters added, animationdone
Merge remote-tracking branch 'origin/master' into ollie

Conflicts:
	app/index.html