Merge branch 'develop'
home page slider
fix all pages
Merge branch 'master' into develop