Fix issue with attr_protected where malformed input could circumvent protection

Fixes: CVE-2013-0276

Conflicts:
	activemodel/lib/active_model/attribute_methods.rb
	activerecord/test/cases/mass_assignment_security_test.rb
bumping to 3.0.21
Merge branch 'manual_patches' into 3-0-stable