Fully update the git-demo repo.

I did a mistake by merging the ROSEdu's PRs on my own repo instead of using the ROSEdu's repo.