js
Merge branch 'master' of github.com:khcr/resj

Conflicts:
	app/views/cards/_location_step.html.erb