Merge branch 'James_Development' into Merge_Test

Conflicts:
src/js/entities/player/player.js