commit before pull
Merge branch 'master' of github.com:filiperp/game_skeleton

Conflicts:
	libs/Utils.swc
	libs/UtilsDisplay.swc