Remove undefined var from LESS
fixes in navigating the result
bugfix
pdfprint fixes
slider for info on box plots
fixes in print
Change deploy so jobs don't export. It's been going awry.
Merge branch 'design' into develop
Move images from public/images to app/assets/images, so it can serve properly
Restructure images, fonts, etc. to conform to the Rails asset pipeline
Point leaflet markers to local source, so that 2x renders (hosted mapbox does not have this)
adv search slider query by median income

example:
    &by_median_income[min]=22175&by_median_income[max]=106417
note:
    this one was just to make a slider working correctly in advanced
search, other advanced search functionalities might night work, or
might be commented out.
before pull-merge from mapc origin
merging all
Merge branch 'pr/5' into design

before merge to MAPC develop
merging all 2 develop/design
Merge branch 'pr/6' into design

Conflicts:
	app/.DS_Store
	app/assets/.DS_Store
	app/assets/javascripts/backbone/.DS_Store
	app/assets/javascripts/backbone/apps/.DS_Store
	app/assets/javascripts/backbone/apps/fstations/list/list_view.js.coffee

app/assets/javascripts/backbone/apps/header/list/templates/headers.jst.e
co
	app/assets/javascripts/backbone/apps/main/search/search_view.js.coffee

app/assets/javascripts/backbone/apps/main/search/templates/simple_search
_layout.jst.eco

app/assets/javascripts/backbone/apps/search/search/search_view.js.coffee

app/assets/javascripts/backbone/apps/search/search/templates/simple_sear
ch_layout.jst.eco
	app/assets/javascripts/backbone/apps/search/search_app.js.coffee
	app/assets/stylesheets/apps/main.less
	db/fixtures/station_areas.csv
	db/schema.rb
	db/seeds.rb
Merge pull request #15 from arminakvn/design

Design
Update seeds to reflect latest
Add advanced search for one field (hh income), and clean up advanced search field structure.