Merge branch 'fixing-tests' of git://github.com/Adam89/fourth_meal into adam
added photos and edited names
finished seed file, with photos
created location model and associated it with restaurants
added location to seedfile
changed home layout to show restaurants by location
uncommented big seed numbers
added location and activate/deactivate button from admin panel
tweaked active/offline view for admin panel
added number to price in order total update flash msg
added travis.yml
added tire and item search form
added tire and search forms to restaurants and items, need to index the db tables
put seeds back to small numbers
took benchmark out of seeds
commented out elastic search
remove ref to tire in location
fixed all tests due to changed homepage view
hide locations that have no restaurants from the rest index
remove search form and format welcome message