Merge pull request #124 from jackykschou/JackySprint11

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

Brandon sprint11
updated heavy shot meta files
Merge branch 'develop' into JackySprint11