JC-1538 issue
Merge remote-tracking branch 'origin/master'

Conflicts:
	jcommune-view/jcommune-web-view/src/main/webapp/resources/javascript/app/forumEffects.js
JC-1538 issue