css sprites for images
thumbnails
merge fixes