Shader / Line Drawing

Update to the Shader, static line drawing buffer, changed axis drawing
and boundbox drawing
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/resolver.cpp