Merge origin/master

Conflicts:
	Home/Tpl/Pay/index.html