Point in convex contour optimization
Additional tests
Contour fix
Contour class refactored
Merge branch 'contour_fix'

Conflicts:
	include/cg/primitives/contour.h