Merge branch 'yanrui_websitework'
last updates before release
Merge pull request #4 from CopticScriptorium/master

update your branch