small changes

yeah
Merge remote-tracking branch 'origin/master'

Conflicts:
	Helpers/resourceManager.lua
	game.lua