Slideshow image change

Added placehold images for the slideshow.
Merging branches

Merged slideshow changes and nav changes.