Upgrade to WebApi 2.1 and MVC 5.1
Merge branch 'feature/mvc51_webapi21_upgrade' into develop