gh-pages更新
Merge branch 'Dev' into gh-pages

Conflicts:
	about.html
	contact.html
	index.html
	news.html
	status.html