Merge remote-tracking branch 'origin/master'

Conflicts:
	MusicFactory/MusicFactory.Client.Console/WorkflowMediator.cs
	MusicFactory/MusicFactory.v12.suo