The great Entrification and ReferenceType beautification
Merge branch 'master' of github.com:Vaakapallo/NPC-dangerzone