Henrik Reitan #1.8
Cleanup in openGL packages
Merge branch 'master' of https://github.com/persn/Lommeradaren.git

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