jqery autocomplete
to be merged to develop
switching off of develop back to aadev
search arguments get updated, start working on tyoeahead
search query in process
show More function fixed. TODO add an event to put back the text value of More
setting up the results page
working on table
setting up the search args
Merge branch 'design' into develop

Conflicts:
	.DS_Store
	app/.DS_Store
	app/assets/.DS_Store
	app/assets/javascripts/.DS_Store
	app/assets/javascripts/backbone/apps/main/main_app.js.coffee
	app/assets/stylesheets/.DS_Store
carousel working and page changes when clicking on Home on header
triggers added for firing up the user guid page still broken
before merging with mapc develop
Merge branch 'develop' of https://github.com/MAPC/equitabletod into develop

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/station_areas/show.rabl
fixing the gem conflicts
carousel fix
deleted the ds store
leaflet loaded
"fetch with promise"
Revert "leaflet loaded"

This reverts commit c5fce055a90d878fabb9ea8a5c9ba88d5abfa8ec.

Conflicts:
	app/assets/javascripts/backbone/apps/main/map/map_controller.js.coffee
	app/assets/javascripts/backbone/apps/main/map/map_view.js.coffee
	app/assets/javascripts/backbone/entities/fstation_areas.js.coffee