Merge branch 'master' of github.com:stefanmay/obviously

Conflicts:
	obvision/reconstruct/grid/RayCastAxisAligned2D.cpp
Merge branch 'master' of github.com:philko4711/obviously

Conflicts:
	obvision/reconstruct/grid/RayCastAxisAligned2D.cpp