Update packages.
Apply more package updates.
Remove MVC 4 guids from project files.

Also, cleaned up a compile warning.
Merge branch 'feature/UpgradeSpaToMVC5' into develop