test to add resturant through controller.
merge of develop into branch
Merge branch 'develop' into controller_and_model_joining
restaurant controller and form for adding new restaurant
flash notification of restaurant additions
x to remove flash box
Merge branch 'develop' of github.com:rubenkostucki/nomnivor into develop

Conflicts:
	app/views/map/_action_call.html.erb
merge conflict in resturants controller spec