Removing jshint for travis
Merge branch 'develop'