Merge branch 'master' into split_fix

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