Display correct sign_in/register options on home page
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'

Conflicts:
	app/views/home/index.html.haml
Customize Employee vs User Restaurant Index Page
format phone and price in view using ActionView Helpers
Fix broken tests do to change in UI
Merge branch 'dev'
Sign up Bug Fix
Add Map to Restaurants index page