no message
Merge branch 'master' of https://github.com/simonsk90/Visual_studio

Conflicts:
	WebApi/MvcApplication1/MvcApplication1.csproj
Merge branch 'master' of https://github.com/simonsk90/Visual_studio