Feature GRDSN-2  -  Re-Design Web UI - update web ui
Merge branch 'master' of https://github.com/leotimus/d46c6d714e2cc3f4b7cf559cf513264a

Conflicts:
	granddesign_layout/test_commit.txt