pull from william
Merge branch 'master' of https://github.com/evotech/MarexPOC

Conflicts:
	app/views/approvalBM.xml
	app/views/detail.xml

tampilan sesuai pak Eddy