index on master: f26316c Merge branch 'master' of github.com:m038/plugin-TagesWocheMobilePluginBundle
WIP on master: f26316c Merge branch 'master' of github.com:m038/plugin-TagesWocheMobilePluginBundle
Merge commit 'stash'

Conflicts:
	Controller/TopicsController.php