added support for multi key/val find operations
Merge branch 'develop' into feature/unit-test

Conflicts:
	package.json