More matching fixes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	public/app/matching/directives/adopteeCriteria/adopteeCriteria.jade
	server/controllers/adoptees.js