Recalculate
Merge branch 'ReCalculate'

Conflicts:
	.classpath
Limit number of pois in searchlist