Merge pull request #117 from jackykschou/JackySprint11

Jacky sprint11
changed ProjectSettings
Merge branch 'develop' into JackySprint11