Increment bbmatch
master merge.
Merge remote-tracking branch 'origin/matt-api-work' into dmitry-stuff

Conflicts:
	server/lib/dre/index.js
	server/package.json