Merge pull request #7 from rgreschner/development-issue5-material-design-ui

Merge feature branch "development-issue5-material-design-ui"
Merge pull request #9 from rgreschner/development

Merge pull request #7 from rgreschner/development-issue5-material-design...