Merge remote-tracking branch 'upstream/master'
upgrading ForumBundle.
Merge remote-tracking branch 'upstream/master'
Downgrade BlogBundle
Merge pull request #189 from ngodfraind/downgrade-blogbundle

Downgrade blogbundle
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/plugin/ICAP/BlogBundle