Optimize images
Merge branch 'master' into javascript
Add .jshintrc, switch gruntfile back to default jshint settings