Merge branch 'develop'
fr
fix
Merge branch 'develop'
readme
radme
Merge branch 'develop'
acl fix and add JMS
readme
Merge branch 'master' into develop
fb and vk
Merge branch 'auth' into develop