findShapes marker performance optimisation
Merge branch 'hldev' into grazwiki

Conflicts:
	includes/queryprinters/SM_QueryHandler.php