Дребни поправки
Merge remote-tracking branch 'origin/setup' into dev

Conflicts:
	core/Db.class.php