Merge branch 'ledger'

Conflicts:
	ownership/js/directives.js
	ownership/js/services/captable.js
Merge branch 'master' into split_fix

Conflicts:
	ownership/js/services/captable.js
Merge branch 'split_fix' into testing

Conflicts:
	ownership/js/services/captable.js