Upgrade to MVC 4
Merge branch 'master' into Mvc4