reorder ACL (automatic)
added unittest to comment
added model comment
Merge branch 'feature-model-comment' into develop