Coherent and convex risk measures