Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
content, layout fixed, slider removed
Merge branch 'master' into dev