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

Conflicts:
	ServerGame.lua
	World.lua
Added player animations to game.