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

Conflicts:
	app/assets/javascripts/router.js
	app/controllers/application_controller.rb
	config/routes.rb
	db/schema.rb