Merge branch 'hotfix/bug_fix'
Fixed a track loading issue with the new tracks.  The tracks were being saved at the wrong point.
Merge branch 'hotfix/bug_fix' into develop