Merge branch 'develop' into BrandonSprint10
THANKS JACKY.
Merge pull request #101 from jackykschou/BrandonSprint10

Brandon sprint10