merging homepageredux into master