Mesocyclonic and non-mesocyclonic convective storms in Germany: Storm characteristics and life-cycle