fixed issue 2136, aka inconsistent lifestyle specifications.
Merge branch 'master' of github.com-relaxolotl:CSCD01/SUCH-TEAM-WOW