Per Olav Flaten Backlog ID 1.3/1.5
 - Sketch dialog window for markers
Merge branch 'master' of https://github.com/persn/Lommeradaren.git

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