minor adjustments after merge pull request from jack sowter.
some very simple sql experiments...
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Berf.sql
	Berf/BerfController.fs
	BerfWeb/Scripts/Berf/Berf.js.map
	BerfWeb/Scripts/_references.js