Merge "Add the Manage menu!" into rvc-dev am: c670ebf25e

Change-Id: Ia1c500f8e3209f6a43a4a387813e6e1b2a3c6634