Merge pull request #44 from jaredwilkening/master

Acl control api
Merge pull request #45 from jaredwilkening/master

minor changes
Merge pull request #46 from jaredwilkening/master

minor changes
fix merge issue
Merge pull request #47 from wtangiit/master

fix merge issue
Acl updates