Fixed tests
Changed naming back
Fixed bad name
More fixes
Merge remote-tracking branch 'origin/Next-Version'

Conflicts:
	knockout.viewmodel.js
More fixes
Merge remote-tracking branch 'origin/master' into Nuget