Merge branch 'oja-api-builder' into oja-transaction-manager

Conflicts:
	src/api.js
	src/scribe.js
Do not place TransactionManager on API object