dual shader, radius fix, more obj, modelMatrix in contructor
Merge remote-tracking branch 'refs/remotes/origin/test' into test

Conflicts:
	src/app/App.java
	src/app/Renderer.java
	src/app/Simulator.java
	src/app/WorldState.java