jslint fixes.
Merge branch 'develop'

* develop:
  jslint fixes.