Merge pull request #164 from uidaho-bsn/dev

Dev into Master, @rsacksteder approves
uncommented database update lines for deployment to Heroku
re-commented database update lines, pushing to Heroku
trying the database update again
Fixed some table headings, fixed forgot password page (issue #157)
commented out database update lines, as this has already been performed on the Heroku site
fixed some table headers and alignment
Fixed order of pretty_note_tone display from accidental/note/octave to note/accidental/octave in all fingerings table per susan's request, also fixed this, as well as alignment issues on note/fingerings canvas. Also fixed alignment of accidentals with note heads on canvas
Merge branch 'master' into pierce-dev

getting changes made to local master branch when deploying to Heroku recently
Fixed all fingerings unapproved fingering coloring issue where sometimes an approved fingering would have a red left border and sometimes a parent row would not be colored (thereby failing to indicate that it had a fingering below it that needs approval
Completed enharmonic fingering display in all fingerings table
Merge pull request #167 from uidaho-bsn/ryan-dev

Bug fix for #166, ability for an admin to add invidual fingerings from a...
Reviewed with Ryan, tested on his machine, looks good.
Merge pull request #169 from uidaho-bsn/ryan-dev

Ryan dev
Merge branches 'dev' and 'pierce-dev' of https://github.com/uidaho-bsn/BFF into pierce-dev

getting a fresh copy of dev
Removed enharmonic_pretty_notes function in favor of doing a substring on pretty_notes when needed. Fixed issue where g natural was being moved in all fingerings table.
Merge pull request #168 from uidaho-bsn/pierce-dev

Pierce dev
Rails migration for admin_order