Merge branch 'master' of github.com:hszuydcase/Music-db-case2-second-edition

Conflicts:
	Music/TestFormCBview.Designer.cs
	Music/TestFormCBview.cs