update
Merge branch 'dev'
slider home
v1 done
Merge branch 'dev'