updated to latest version
added basic game screen support
Merge branch 'master' of https://github.com/roccojanse/js-platformer

Conflicts:
	src/js/game.js
	src/js/gfw/Object.js
	src/js/gfw/ObjectManager.js
	src/js/gfw/Screen.js
	src/js/gfw/Text.js
	www/js/js-platformer.js