Merge branch 'develop'
Fix up typescript case sensitive reference errors.
Missing combat map.
Merge branch 'master' into develop