Merge branch 'master' of https://github.com/pranitar/WhereToEat into pranitar-master

Conflicts:
	app/views/home/index.html.erb
	app/views/restaurants/show.html.haml
minor changes
Merge branch 'master' of http://github.com/emanchan/WhereToEat into pranitar-master