vitaly fix
Merge branch 'release/r15'
Merge branch 'hotfix/h1' into develop
fix scroll
Merge branch 'release/r16'
Merge branch 'master' of github.com:webBoxio/codefront.io-2014