push
push
sprites
Merge remote-tracking branch 'origin/master'

Conflicts:
	#317 Customizable/com/client/Client.class
	Server/Data/characters/testing22.txt