create association for service_type to services, now you can call service_type.services
merge master into service-type-associations
complete new form for service with associated service_type
complete services page with services grouped by type
add service_tpye to test data