Fix on comments sorting
Merge branch 'dev-candy' of https://github.com/buddycloud/webclient into dev-candy
Merge pull request #294 from buddycloud/master

Merge pull request #293 from buddycloud/dev-candy
Merge pull request #295 from buddycloud/dev-candy

Fix tests