thread safe peer manager
Merge commit '41e21c9a765e074760314c6cb369d2fe38855512' into develop

Conflicts:
	bitherj