Add /.idea to .gitignore
Merge branch 'r3_upgrade_sue' of https://github.com/suegrimes/seqLIMS.git into r3_upgrade_sue

Conflicts:
	.gitignore
Merge branch 'r3_upgrade_jen2' of https://github.com/suegrimes/seqLIMS.git into r3_upgrade_sue
Misc changes - date formatting, error formatting, bug fixes
Merge branch 'r3_upgrade_jen2' of https://github.com/suegrimes/seqLIMS.git into r3_upgrade_sue
Modify find commands (models), form_for/error_messages (views)
Miscellaneous changes to fix code for Rails 3.2
Add '=' in <%= fields_for %> (flow_lane_form)
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
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