Added commenting on folders
Merge branch 'master' into folders-messages
Fixed Folder push notifications
Merge branch 'master' of https://github.com/oaeproject/3akai-ux into issue3711