Continued work towards IIS
Merge remote-tracking branch 'origin/master'

Conflicts:
	TimberWinR/Configuration.cs
Merge remote-tracking branch 'origin/master'

Conflicts:
	TimberWinR/Configuration.cs