Merge remote-tracking branch 'origin/r3_upgrade_sue' into r3_upgrade_jen2
modification to .gitignore
reverted last mod to .gitignore
removed obsolete div_toggle
Modify controllers/models to use sql_where
- Return nil if condition_array is empty, otherwize parameterize array