Seb/armour

merging item generation into master