Merge pull request #32 from baasbox/develop

Develop
add new screenshot
Merge pull request #33 from baasbox/master

pull from master