Cinnabon adds chocolate, cherry flavors