Henrik Reitan
First draft of text rendering for markers
Merge remote-tracking branch 'origin/augmented' into augmented

Conflicts:
	Lommeradaren/src/no/kystverket/lommeradaren/camera/augmented/opengl/MarkerRenderer.java