player animations
Merge remote-tracking branch 'origin/master'

Conflicts:
	ConnectedWorlds/ConnectedWorlds/Globals.h