Minimize changes
Using Locator to find test resources
Merge branch 'locator' into multiTorrentClient

* locator:
  Using Locator to find test resources
Minimizing changes
Minimizing changes
Minimizing changes
Minimizing changes
Minimizing changes