tampilan asen tanggal 14
Merge branch 'master' of https://github.com/evotech/MarexPOC

Conflicts:
	app/styles/authorityView.tss
	app/styles/main.tss
	app/views/main.xml
Merge branch 'master' of https://github.com/evotech/MarexPOC