Code review changes
Merge branch 'dborkan-async' of https://github.com/uProxy/uproxy into dborkan-async

Conflicts:
	src/generic_core/social.spec.ts