no message
Merge branch 'develop' of https://github.com/jiangkuo888/ORP_beta into develop

# By jiangkuo888
# Via jiangkuo888
* 'develop' of https://github.com/jiangkuo888/ORP_beta:
  new zoomIn
  Player label on top of head.  New document page content system.

Conflicts:
	Assets/Scenes/Fire_event_merged.unity
Merge branch 'develop' of https://github.com/jiangkuo888/ORP_beta into develop

Conflicts:
	Assets/Scenes/Fire_event_merged.unity