dyno animation + map + zoom
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Character.hx
dyno animation + map + zoom + merge