from
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/SqlBuilder/SqlBuilderBase.cs
prebuilt templates, orderby enumerable, more joins, cleanup