Merge pull request #20 from ctorstens/development

Development
Merge branch 'development' of https://github.com/ctorstens/ScreenOverflow into development