Merge branch 'master' of https://github.com/DingYong4223/syscoin

Conflicts:
	bieggs/App/Modules/Home/Tpl/prize/pdesc.html