my merged
Merge branch 'develop' of https://github.com/jiangkuo888/ORP_beta into develop
some fixes in animation and waypoints and dialogue