Re-fixed canvas display of accidentals (it was no longer working for some reason)
Merge branch 'ryan-dev' into pierce-dev

pulling in changes from snapshot day for presentation into pierce-dev
Added admin order to show.html and changed all admin order to ASC