CheckSQL: Add test for if expression in options
CheckSQL: Fix if expressions in options
CheckSQL: Add test for injection in scope lambda
CheckSQL: Fix multiline scope lambdas
CheckSQL: Debug output for unhandled methods
Fix highlighting of HTML escaped values in report
Prefer user_input line number for warnings
Let Warning set line number where possible

same effect, less code
Fix line numbers in tests (to better ones!)
Merge branch 'master' into simple_helper_scanning

Conflicts:
	test/apps/rails3.1/app/controllers/users_controller.rb
	test/apps/rails3.1/config/routes.rb
CheckSQL: Add test for safe "or" interpolation
CheckSQL: Check "or" expression interpolation
CheckSQL: Add test for #to_f interpolation
CheckSQL: Add #to_f as safe method to interpolate
CheckSQL: Ignore sanitize methods in interpolation
CheckSQL: Ignore nil, true, false in interpolation
CheckSQL: Add test for merge_conditions

which does not appear to be in Rails 3
CheckSQL: Ignore safe methods on user input
CheckSQL: Add merge_conditions as safe SQL method
Remove duplicate check for @line in Warning