Merge branch 'master' into temkav
changes on resize 480px
Merge branch 'temkav'