knock out
Merge https://github.com/vivekkumarm/knockout

Conflicts:
	knockout/Views/Home/Grid.cshtml