Merge branch 'hotfix/UpdateGitignore'
Merge branch 'develop'
Merge pull request #1 from shiningjason1989/master

Master