Merge remote-tracking branch 'origin/r3_upgrade_sue' into r3_upgrade_jen2
fixed accidental output of array
rm'd prototype, added jquery autocomplete
added jquery autocomplete
aadded jquery autocomplete
adding jquery autocomplete
changes for autocomplete
rm'ed extra erb r bracket
put prototype require back - needed for superfish
rm'ed autocomplete require - messed with other js and not needed on this file!
adding jquery autocomplete
Fix users error when condition_array is empty
*** This will need to be fixed everywhere condition_array is used ***