fix on documentation wrapping
add documentation for acl control
Merge branch 'develop' into billing