- fix to deploy in non-root contextRoot
- added missing field to workreport metamodel
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/js/tri-cz3ck-models.js