adding images and lightbox update
adding changes from server
fixing conflict
background for carousel