added bxslider
merged conflict in show