Added armor items and max stack size for them.
Merge remote-tracking branch 'origin/master'