Images: not finished
Fixes for Images (not finished)
Added thumbnail class for images
Resoved conflict during images->master merge