front page settings
Merge branch 'common/dev'

* common/dev:
  front page settings

dev files to master