fix
for deploy
Merge branch 'master' into develop
deploy
views
front page is ok