building out matching interface, incremental
Merge branch 'afsin'

Conflicts:
	client/src/app/matching/matching.tpl.html

allergy_id -> entry_id