added 'control' resource to acl
fixed conflict on branch merge