check in
Merge remote-tracking branch 'origin/master'

Conflicts:
	midana/midana.v11.suo
	midana/midana/bin/System.Net.Http.Formatting.dll
	midana/midana/bin/System.Web.Http.WebHost.dll
	midana/midana/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	midana/midana/obj/Debug/midana.csprojResolveAssemblyReference.cache