Better combo date display
Merge branch 'develop' into feature/lists-mvp

Conflicts:
	app/helpers/combos_helper.rb