Merge remote-tracking branch 'origin/master'

Conflicts:
app/public/img/class/automotive.png
app/public/img/class/business.png
app/public/img/class/culinary.png
app/public/img/class/diy.png
app/public/img/class/fitness.png
app/public/img/class/games.png
app/public/img/class/history.png
app/public/img/class/original.png
app/public/img/class/class defaults.psd