#JC-1248 Changes after code review.
Merge branch 'develop' of git@github.com:jtalks-org/jcommune into develop