matching of allergies issue fix.
Merge branch 'master' into judge-ito

Conflicts:
	client/src/app/matching/reconciliation/review/review.js

client/src/app/matching/reconciliation/review/templates/allergies_v2.tpl
.html
allergies greying fixes.
Merge pull request #248 from amida-tech/judge-ito

Judge ito