merge cm updates
add files for navbar volume controls
add volume controls to Navbar