Merge pull request #12 from merlinND/camera

Fix camera view matrix
Stubs for object positioning

Conflicts:
	src/geometry/Object.cpp
	src/geometry/Object.h