Update dependency to Caliburn.Micro v1.4
Update version to v2.0.6
Fixup Todo sample.
Fixup NavSample sample
Fixup TempHire.Wpf sample.
Fixup TempHire.SL sample.
Fixup HappyHour sample.
Fix project file references gone mad.
Improve password encryption scheme in TempHire
Fix exception thrown by User.Authenticate if wrong password
Merge branch 'master' of github.com:IdeaBlade/Cocktail into merge_upstream

Conflicts:
	Cocktail.Compat/Cocktail.Compat.SL.csproj
	Cocktail.Compat/Cocktail.Compat.csproj
	Cocktail.Compat/OperationFns.cs
	Cocktail.Compat/Properties/AssemblyInfo.cs
	Cocktail.Compat/packages.config
	Cocktail.Utils/Properties/AssemblyInfo.cs
	Cocktail/Properties/AssemblyInfo.cs
	Cocktail/packages.config
	NuGet/IdeaBlade.Cocktail.Compat.nuspec
	NuGet/IdeaBlade.Cocktail.Utils.nuspec
	NuGet/IdeaBlade.Cocktail.nuspec
	Samples/HappyHour/02-HappyHour/HappyHour/HappyHour.SL5.csproj
	Samples/HappyHour/02-HappyHour/HappyHour/packages.config
	Samples/HappyHour/03-HappyHour/HappyHour/HappyHour.SL5.csproj
	Samples/HappyHour/03-HappyHour/HappyHour/packages.config
	Samples/HappyHour/04-HappyHour/HappyHour/HappyHour.SL5.csproj
	Samples/HappyHour/04-HappyHour/HappyHour/packages.config
	Samples/HappyHour/05-HappyHour/HappyHour/HappyHour.SL5.csproj
	Samples/HappyHour/05-HappyHour/HappyHour/packages.config
	Samples/HappyHour/06-HappyHour/HappyHour/HappyHour.SL5.csproj
	Samples/HappyHour/06-HappyHour/HappyHour/packages.config
	Samples/HappyHour/07-HappyHour/HappyHour/HappyHour.SL5.csproj
	Samples/HappyHour/07-HappyHour/HappyHour/packages.config
	Samples/HappyHour/08-HappyHour/HappyHour/HappyHour.SL5.csproj
	Samples/HappyHour/08-HappyHour/HappyHour/packages.config
	Samples/NavSample/NavSample/NavSample.csproj
	Samples/NavSample/NavSample/packages.config
	Samples/NavSample/Server/App_Data/NorthwindIB.sdf
	Samples/TempHire/Common/Common.SL.csproj
	Samples/TempHire/Common/Common.csproj
	Samples/TempHire/Common/packages.config
	Samples/TempHire/DomainModel.SL/DomainModel.SL.csproj
	Samples/TempHire/DomainModel.SL/packages.config
	Samples/TempHire/DomainModel/DomainModel.csproj
	Samples/TempHire/DomainModel/packages.config
	Samples/TempHire/DomainServices/DomainServices.SL.csproj
	Samples/TempHire/DomainServices/DomainServices.csproj
	Samples/TempHire/DomainServices/SampleData/SecuritySampleDataProvider.cs
	Samples/TempHire/DomainServices/packages.config
	Samples/TempHire/Harness/Harness.SL.csproj
	Samples/TempHire/Harness/Harness.csproj
	Samples/TempHire/Harness/packages.config
	Samples/TempHire/Security.SL/Security.SL.csproj
	Samples/TempHire/Security.SL/packages.config
	Samples/TempHire/Security/LoginManager.cs
	Samples/TempHire/Security/Security.csproj
	Samples/TempHire/Security/SecurityDbContext.cs
	Samples/TempHire/Security/SecurityEntities.ibmmx
	Samples/TempHire/Security/User.cs
	Samples/TempHire/Security/packages.config
	Samples/TempHire/TempHire/TempHire.SL.csproj
	Samples/TempHire/TempHire/TempHire.csproj
	Samples/TempHire/TempHire/ViewModels/Login/LoginViewModel.cs
	Samples/TempHire/TempHire/packages.config
	Samples/Todo/Todo/Todo.csproj
	Samples/Todo/Todo/packages.config
	Test Projects/Cocktail.Tests/Properties/AssemblyInfo.cs
	Test Projects/Cocktail.Tests/packages.config
	Test Projects/Test.Model/Properties/AssemblyInfo.cs
	Test Projects/Test.Web/Properties/AssemblyInfo.cs
Merge cleanup