Merge branch 'jshint_appeasement' into allow_debug
Merge branch 'allow_debug' into gymapp