Vendor Info and video
Merge branch 'master' of https://github.com/SBMG/premierbride-production

Conflicts:
	root/market.php