Fixed project file issues
Merge branch 'master' into mvc