Client fixes
server part 1
Merge pull request #174 from rodms10/jshint

Jshint server pass part 1