Merge pull request #33 from ctorstens/development

Development
Merge branch 'master' of https://github.com/ctorstens/ScreenOverflow into development
fixed userspec
Merge branch 'development' into user_profile