fixed find queries being run twice
updated and fixed norm and sample
added count and find methods
Merge branch 'master' into releases

Conflicts:
	build.sbt
norm v2.3.6