Merge branch 'develop' of git://github.com/sulu-cmf/SuluAdminBundle into...

- [ ] finished the code
- [ ] gathered feedback for my changes
- [ ] submited changes to the documentation


| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| Tests pass?   | none
| Fixed tickets | none
| Doc           | none