Undercompressive shocks and Riemann problems for scalar conservation laws with non-convex fluxes