Bugfix by turegjorup, tuj: Fixed nesting bug in slidescontroller, refactored other controllers accordingly
Merge branch 'development' of github.com:Indholdskanalen/indholdskanalen into development

# By Troels Ugilt Jensen
# Via Troels Ugilt Jensen
* 'development' of github.com:Indholdskanalen/indholdskanalen:
  Bug fix test

Conflicts:
	src/Indholdskanalen/MainBundle/Entity/Slide.php