xD xP
Merge branch 'master' into pablo

Conflicts:
	app/controllers/restaurants_controller.rb