Edits from Stacy, rnd 1
Updates from Stacy
Updated stock images
Image Filters
Final updates before launch (from stacy)
merge upstream/master