fix error with topic tag join
Merge branch 'master' into develop

Conflicts:
	Core/ForumBundle/DependencyInjection/ForumManager.php
fix
Merge pull request #27 from seyon/develop

Develop