attempt to put villager in map but needs fix
Merge branch 'master' of https://github.com/ZimonD/ContextCG7