by zhanyi
Merge remote-tracking branch 'origin/master'

Conflicts:
	_examples/index.html
by zhanyi