Survey window remove vertical layout
Problem fixed: image cannot zoomin
Merge branch 'master' of https://github.com/evotech/MarexPOC

Conflicts:
	app/views/detail.xml
Fixed resources location
Merge branch 'master' of https://github.com/evotech/MarexPOC

Conflicts:
	app/styles/approvalBM.tss
	app/styles/main.tss
Merge branch 'master' of https://github.com/evotech/MarexPOC
navbar color update
Merge branch 'master' of https://github.com/evotech/MarexPOC