Added commenting on folders
Merge branch 'master' into folders-messages
Fixed Folder push notifications