removed some jshint issues
Merge branch 'develop'

* develop:
  removed some jshint issues