Merge branch 'hotfix/2.5.7'
Need to really ignore all the minified js files in jshint.
Meh
Apparently we need to ignore all of the folders individually.
Merge branch 'hotfix/2.5.8' into develop