Finishes clients grid
pushes scott-dev
Merge branch 'mikedev'