Merge remote-tracking branch 'origin/master'

Conflicts:
	yongxinxiu/src/main/webapp/WEB-INF/staticPage/index.html