Added test for provider through taxi
Fixed merge conflicts
Create services_controller_spec
Add test to put service/create
Merge branch 'master' into spec_provider
Tests don't crash
Merge pull request #17 from Sbfrr/spec_provider

Spec provider