Merge branch 'develop' into BrandonSprint11
fixed section highlights not resetting properly, updated heavy shot particle
Merge pull request #125 from jackykschou/BrandonSprint11

Brandon sprint11