Fix merge problems: commit 1.
Merge branch 'develop' of github.com:crazyskeggy/php-workspace into develop

Conflicts:
	includes/setup-db.php
	load.php