centerfix change
everything up to speed, small fix needed in flexslider (bottom overflow)
merge conflict resolve