using css display rather than visibility in show/hide div
rm'ing file no longer used
Merge remote-tracking branch 'origin/r3_upgrade_sue' into r3_upgrade_jen2
more recent version of rails.js (not being used tho)
rm'ed rails.js
Merge remote-tracking branch 'origin/r3_upgrade_sue' into r3_upgrade_jen2
Modify order of .find/.includes in controllers