Merge branch 'lwjgl' of https://github.com/Moepelchen/StreetMap into lwjgl

Conflicts:
	src/streetmap/Game.java