Resolved conflicts
Merge branch 'master' of d:/GitRepo

Conflicts:
	RestFoundation/RestFoundation/Client/RestClientFactory.cs