Merge remote-tracking branch 'origin/master'

Conflicts:
	approve.html
	changxue.html
	course.html
	course2.html
	css/wx-pay.css
	filter.html
	filter2.html
	index2.html
	js/core/pay.js
	payment.html
	payment2.html
	payment3-2.html
	payment3-3.html
	payment3.html
	praise.html
	sale.html
	video-page.html
	video-page2.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	approve.html
	css/wx.css
Merge remote-tracking branch 'origin/master'

Conflicts:
	approve.html
	changxue.html
	course.html
	course2.html
	css/wx-pay.css
	filter.html
	filter2.html
	index2.html
	js/core/pay.js
	payment.html
	payment2.html
	payment3-2.html
	payment3-3.html
	payment3.html
	praise.html
	sale.html
	video-page.html
	video-page2.html