Better non-overlapping tray animation
Merge branch 'master' of https://github.com/CloudKidStudio/PBSKidsGame

Conflicts:
	dist/modules/progress-tracker.js