using css display rather than visibility in show/hide div
rm'ing file no longer used
Fix users error when condition_array is empty
*** This will need to be fixed everywhere condition_array is used ***
Merge remote-tracking branch 'origin/r3_upgrade_sue' into r3_upgrade_jen2
Modifications to .find (in controllers) for R3 syntax
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