Merge branch 'develop'
add link to luxun ppt
Merge branch 'master' into develop