Updated to use new ACL permissions, and includes Wiki in navigation tree
Updated version