merge in newer updates from CM and commits for evita

Updates to latest from CM and enables hardware key menus for ville/evita