#JC-1428 Refactoring.
Merge branch 'master' of git@github.com:jtalks-org/jcommune