Conflicts:
	framework/db/dao/Command.php
	framework/db/dao/Connection.php
	framework/db/dao/Query.php
	framework/db/dao/mysql/Schema.php
	tests/unit/data/config.php
	tests/unit/data/mysql.sql
	tests/unit/framework/db/dao/ConnectionTest.php