fosrestbundle conf continue
Merge branch 'master' of github.com:MartinLG/CallOfBeerAPI

Conflicts:
	app/config/routing_rest.yml
	src/CallOfBeer/ApiBundle/Resources/config/routing_rest.yml