completed dummy services and services types + edit views with anticipated methods from querying db
merged master with erb views