Refactored NVPR and Annotations
Merge branch 'master' of github.com:dgimb89/glat

Conflicts:
	src/glat/RendererFactory.cpp