Merge branch 'localization'

Conflicts:
	Music.Test.Web/Common.cs
	Music.Test/AlbumFromBandModel.cs
	Music.Test/DemoPackageLogic.cs
	Music.Test/Environment/AlbumFromBandModel.cs
	Music.Test/Environment/Starter.cs
	Music.Web/Global.asax.cs
	Music.Web/Models/AlbumFromBandModel.cs
fix tests
Merge branch 'master' into bla

Conflicts:
	Music.Test.Web/OperationsTests.cs
add GitExtensions.settings
Merge branch 'typescript'