Merge branch 'master' of https://github.com/claroline/ForumBundle

Conflicts:
	Entity/Category.php
	Entity/Forum.php
	Entity/Message.php
	Entity/Subject.php
Updater V1
Merge branch 'vincent'

Conflicts:
	Entity/Category.php
	Entity/Forum.php
	Entity/Message.php
	Entity/Subject.php