posledni verze nette problem s Ambiguous class a Class not found

Zdravim dneska jsem s gitu stahl posledni verzi co je dostupna jelikoz jsem chtel neco vyzkouset.
Bohuzel dostavam tyto chyby.

Ambiguous class 'Nette\Configurator' resolution; defined in /var/www/web/libs/Nette/common/Environment.php and in /var/www/web/libs/Nette/common/Configurator.php

jedine co pomohlo zakomentovani definicie v Enviromentu bohuzel lepsi reseni jsem nenasel.

a druhy trosku zradnejsi problem.
prestala fungovat factory na entitymanager s touto exception

Class EntityManager returned by \ServicesFactory::getEntityManager has not been found

tovarna vypada

public static function getEntityManager() {
		return self::$em ? : self::createEntityManager();
}

	public static function createEntityManager() {

		$database = (array) Environment::getConfig("doctrine")->database;

		$em = \Doctrine\ORM\EntityManager::create($database, self::createDoctrineConfiguration());
		$em->getEventManager()->addEventSubscriber(self::getFileTools());

		return self::$em = $em;
	}

k tomu bych se rad zeptal abych odstranil Enviroment::getConfig …
jak upravit volani techto tovarnicek v configu neco jako

Doctrine\ORM\EntityManager:
	factory: \ServicesFactory::getEntityManager
	arguments:[%database.doctrine%]

EDIT: VERZE
Nette Framework 2.0-beta (revision 3991ebe released on 2011–12–09)

Editoval awsickness (9. 12. 2011 15:56)