views refactoring and routes
Merge remote-tracking branch 'origin/master' into single_restaurant

Conflicts:
	views/header.html
Merge pull request #1 from andreqi/single_restaurant

views refactoring and routes