Merge origin/master

Conflicts:
	data/back/local.php
	data/back/zenddevelopertools.db.local.php