Moved AspNetServiceLocator.cs back to where it belongs
Fix #276 - Finalized the conversion of the solution over to .NET 4.5