Change personRoleMap to reifyAgentRoles used in decorate/undecorate steps
Merge branch 'master' of github.com:libris/kitin

Conflicts:
	static/js/controllers/EditCtrl.js
	static/js/services/services.js