camera control
camera control
camera control
Merge branch 'master' of https://github.com/irpainel/city

Conflicts:
	src/framework/Keyboard.o
	src/framework/PerformanceTimer.o
	src/math/Random.o
	src/window/Viewport.o