Merge feature branch "development-issue5-material-design-ui"

Merging feature branch into dev.