Merge branch 'master' of https://github.com/vladzaharia/drinkingisfun

Added jukebox animation
Conflicts:
	World.lua
	playerAnimation.lua
Merge Stuff
Merge branch 'master' of https://github.com/vladzaharia/drinkingisfun

Conflicts:
	World.lua
	playerAnimation.lua
Finish conflict merging
Merge branch 'master' of https://github.com/vladzaharia/drinkingisfun

Conflicts:
	ServerGame.lua
	World.lua
	playerAnimation.lua
Fix eof