Armour/ Artillery Museums around Munich?

[Allan Williams]

Hi All,
Wondering if anyone's aware of any armour or artillery museums around Munich? Going to be around there and Berchtesgaden in July for a couple of weeks and wouldn't mind trying to give myself a bit of a dose if possible.
Also wondering if anyone knows the museum in Slovenia that has a few flak on display?
Any info would be great!
Cheers
Allan