LMOE and Cabins
Merge branch 'master' of github.com:TheDarklingWolf/Cataclysm-DDA into merge_LMOA