reports ui updates
server config
Merge remote-tracking branch 'origin/dev' into dev
Merge branch 'dev' into dev-test