Merge branch 'master' into 'user_pages'

# Conflicts:
#   Gemfile
#   config/routes.rb
#   config/setting.yml
Status Job ID Name Coverage
  Build
failed #1603
build

 
  Test
skipped #1605
allowed to fail
codequality
skipped #1604
test
 
Build build
No job trace