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