Merged proxy.php into collectionproxy.php
update of rbac