OpenSlides/OpenSlides — pull request #1360 by ostcar (2014-10-18 06:58:03+00:00)
Title: merge of the stable branch into master

I want to push this directly into the master branch. There was only one conflict (see merge commit).

Any remarks?