Reset to MVC 4
Merge branch 'master'