Merge pull request #1 from tobias-engelmann/darkside

Merged darkside into master
Merge branch 'devel-backend'
Various fixes