Merge tag '1.0.21' into develop

Add tabs to admin/news

* tag '1.0.21':
return Gemfile.lock because of sshkit gem
Merge branch 'release/1.0.21.1'

* release/1.0.21.1:
  return Gemfile.lock because of sshkit gem