Merge branch 'master' into feature/ozp-64-preferences-api

Conflicts:
	modules/client/src/main/webapp/js/models/Model.js