Conflicts are fixed but TODOs are left.

Fixed conflicts:
	src/DynamoCore/Library/Library.cs
	src/DynamoCore/Library/LibraryServices.cs
	src/DynamoCore/Models/DynamoModel.cs
	src/DynamoCore/PackageManager/Package.cs
	src/DynamoCore/Search/BrowserInternalElement.cs
	src/DynamoCore/Search/BrowserItem.cs
	src/DynamoCore/Search/SearchElements/CustomNodeSearchElement.cs
	src/DynamoCore/Search/SearchElements/DSFunctionNodeSearchElement.cs
	src/DynamoCore/Search/SearchElements/NodeSearchElement.cs
	src/DynamoCore/Search/SearchModel.cs
Resolved conflicts:
	test/DynamoCoreTests/SearchModelTests.cs
	test/DynamoCoreTests/SearchViewModelTests.cs