changes
Merge branch 'master' of https://github.com/srdjan-cengic/restaurants

Conflicts:
	app/controllers/api/restaurants_controller.rb