Fully merged auth and menu branches.

Auth and feed are currently unavailable.