Merge branch 'robert'
Merge branch 'master' into Zeke
Character json reading and waypoints
Merge branch 'Zeke'
Merge branch 'master' into robert