Final
Merge origin/master

Conflicts:
	SQL/markers_individual.sql