Merge branch 'develop' of https://github.com/ozone-development/meridian into enhancement/22/clearSnapshot

Conflicts:
	app/components/controls/timeline/snapshot-menu.hbs
Merge branch 'enhancement/22/clearSnapshot' of https://github.com/ozone-development/meridian into enhancement/22/clearSnapshot

Conflicts:
	app/components/controls/timeline/snapshot-menu.hbs