Preheat the oven to 180C.Butter and dust with flour a 24cm or 22x33cm baking pan.Whisk together almonds,flour,salt,vanilla or cinnamon.In another bowl mix butter and sugar until fluffy,add flour mixture in 2 batches and mix everything on minimum speed until a crumbly dough forms.Reserve one cup (250ml) of dough.Press the rest onto bottom of pan.Scatter berries over dough,sprinkle with 1 tablespoon of sugar and crumble reserve dough on top.Bake for 30' until golden.Let cool and sprinkle with ground almonds and dust with sugar.