interaction #1 and #3 fixed
Merge branch 'master' into dmitry-checkpoint

Conflicts:
	client/src/app/matching/reconciliation/review/review.tpl.html
Merge pull request #222 from amida-tech/dmitry-checkpoint

interaction #1 and #3 fixed