Changed mapping to SO.
Merge branch 'master' of https://github.com/Polyjuice/Skyper

Conflicts:
	Server/Master.json.cs
Mapped to legal entity.