Fixed itype order again.
Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA