minor changes
Merge branch 'master' of https://github.com/Mec-iS/trovabiomassaprod

Conflicts:
	app/backend/Markers.py