wew
Merge branch 'master' of https://github.com/evotech/MarexPOC

Conflicts:
	app/controllers/approvalBM.js
	app/views/approvalBM.xml

fix error