Fixes bug 1055538 - Removed the form_field_type option from Super Search fields.
Merge pull request #2304 from AdrianGaudebert/1055538-remove-form_field_type

Fixes bug 1055538 - Removed the form_field_type option from Super Search fields.
fixes bug 1053853 - django 1.4.14/1.5.9/1.6.6 security update (Socorro)
Merge pull request #2309 from peterbe/bug-1053853-django-1414159166-security-update-socorro

fixes bug 1053853 - django 1.4.14/1.5.9/1.6.6 security update (Socorro)
Merge branch 'master' into bug1035336-cleanup-jquery-ui-spaghetti