Adoptee matching work in progress
Merge branch 'master' of https://github.com/thombrg/topekacb-local into thombrg-master

Conflicts:
	public/app/matching/mvMatchCtrl.js
	server/models/Adopter.js
Merge pull request #80 from nxidis/thombrg-master

Thombrg master