Merge branch 'master' into dmitry-stuff
Ripped old bb and match JS libraries (+ draft XML demo samples)
unfinished samples for demo r1.0
Increment bbmatch
Sample #1,#2,#3 are done (needed partial match #4 sample)
master merge.
Merge branch 'master' into dmitry-stuff
package issues with hardcoded versions
Merge remote-tracking branch 'origin/matt-api-work' into dmitry-stuff

Conflicts:
	server/lib/dre/index.js
	server/package.json
Merge branch 'dmitry-stuff' of https://github.com/amida-tech/DRE-UX into dmitry-stuff
shim for demographics
all changes
Merge branch 'dmitry-stuff'