Dev

dev merge module slider