Working towards moving map

- glViewport in Application.class under update()
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/namone/worldGen/WorldGen.java