edited by asen from designer advice
Merge branch 'master' of https://github.com/evotech/MarexPOC

Conflicts:
	app/views/detail.xml