fixed problems
Added Visual Studio Express to media-services.md
fix merge conflict #939
Merge pull request #941 from mollybostic/master_0131

fixing merge conflict #939