Cardamom Shortcake With Maple Berries