Add age to matching search
Merge remote-tracking branch 'upstream/master'

Conflicts:
	server/config/mongoose.js