conflicts in test were fixed
fix NamespaceResolverTest
Merge branch 'dsov-masterNs' into dovg-namespaces

Conflicts:
	test/AllTests.php