Merge "Add the Manage menu!" into rvc-dev