Update blog plugin with new design with bootstrap3
Update blog plugin
Merge branch 'master' into update-blog-plugin

Conflicts:
	src/plugin/ICAP/BlogBundle
Merge pull request #212 from maxailloud/update-blog-plugin

Update blog plugin with new design with bootstrap3
Merge remote-tracking branch 'upstream/master' into bugfix