Merge pull request #3057 from alphagov/new_org_types_part_1

Introduce new org types

app/templates/views/service-settings.html

@@ -322,6 +322,11 @@
                     'central': 'Central government',
                     'local': 'Local government',
                     'nhs': 'NHS',
+                    'nhs_central': 'NHS – central government agency or public body',
+                    'nhs_local': 'NHS Trust, GP practice or Clinical Commissioning Group',
+                    'emergency_service': 'Emergency service',
+                    'school_or_college': 'School or college',
+                    'other': 'Other'
                   }.get(current_service.organisation_type) }}
                 </div>
               {% endif %}