Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/com/base/engine/Camera.class
	bin/com/base/engine/Game.class
	res/camera/camera.save
	res/shaders/phongVertex.vert
	src/com/base/engine/Camera.java
	src/com/base/engine/Game.java