Merge origin/master

Conflicts:
	Websites/zingphp.com/Pages/Home.php
	Zing/src/modules/Database/DBOTable.php