Config
Merge remote-tracking branch 'origin/master'

Conflicts:
	ThortonService/ThortonService/Program.cs