Reverted some changes caused by Resharper
Merge remote-tracking branch 'origin/master'

Conflicts:
	TheLivingRoom/Furniture.cs
	TheLivingRoom/PlaybackEngine.cs