fixed up some inconsistencies in a couple of the projects' packages.config that the new nuget update noticed
Merge branch 'origin/develop'