update di Acc
update Acc
Merge branch 'master' of https://github.com/evotech/MarexPOC

Conflicts:
	app/styles/main.tss
update acc, fix error load data