fdfafaf
Merge branch 'master' of https://github.com/worldjingsai/code

Conflicts:
	static/common/template/index/index.html