csv tasks
Merge branch 'master' of https://github.com/khcr/resj

Conflicts:
	app/assets/javascripts/sitewide/functions.js
	app/views/cards/_location_step.html.erb