updated merge scene with non interactive NPC
Merge branch 'develop' of https://github.com/jiangkuo888/ORP_beta into develop