Committing because it told me to

Doesn't look to do any real changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Spooks/Library/CurrentLayout.dwlt
	Spooks/Spooks-csharp.sln
	Spooks/Spooks.sln