jshint
keeping up
Merge branch 'develop' into staging