Slight updates to the chatmapper file
Merge branch 'develop' of https://github.com/jiangkuo888/ORP_beta into develop
adjusted NPC and Player prefabs to new assets placement and added Dialogue system to players
merge conflicts