changed ProjectSettings
Merge branch 'develop' into JackySprint11
Merge pull request #118 from jackykschou/JackySprint11

Jacky sprint11
Merge branch 'develop' into BrandonSprint11