Merge branch 'master' into jingxian2

Conflicts:
www/index.html