boolean fix
vesting fix
possible grant fix
Merge branch 'master' into document_transaction

Conflicts:
	documents/js/controllers/annotationController.js
	documents/js/services.js
Merge branch 'document_transaction' into testing

Conflicts:
	ownership/js/services/calculate.js