Push modification by David on the server.

David pushed some of the changes to github, but not all.
I did two steps for it:
1. git pull the latest code on the develop branch
2. connect to the server directly and copy the modified files to local