Legal Done!
Merge remote-tracking branch 'origin/master'

Conflicts:
	Shafam.UserInterface/Shafam.UserInterface.csproj