Per Olav Flaten Backlog ID 1.8
 - Communication of marker data between the tracker and the OpenGL
   renderer has been established.
Merge branch 'master' of https://github.com/persn/Lommeradaren.git

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