Merge pull request #31 from 51seven/staging

Changes on staging not on development
Merge pull request #33 from 51seven/staging

Jaja, ich hör schon damit auf
tried something with comments and titles
Merge pull request #34 from 51seven/development

Development to staging