add jshint ok globals for testing
Merge branch 'testing' into develop