merijn sync
Merge branch 'version-1.2.3' of https://github.com/utvid/ut_videotracker into version-1.2.3

Conflicts:
	functions/utility/historyfolder.mat