latest merged scene with chatmapper and log updated from sahaja
Merge branch 'develop' of https://github.com/jiangkuo888/ORP_beta into develop

Conflicts:
	Assets/Scenes/Fire_event_merged.unity