Refactored aggregators in queries
Refactored aggregate API to match jena more closely
Added initial code for pre-checking facet counts
Pre-check of facet counts seems to be working again
Towards getting the counting system work
Merge branch 'feature-sponate' into develop

Conflicts:
	test/rdf/NodeFactory.js