Merge branch 'master' into development

* master:
  update ruby version
seo crap
Merge branch 'development'

* development:
  seo crap