Merge branch 'dev' into 34-frontend

Conflicts:
Gemfile.lock
app/controllers/blogs_controller.rb
app/models/blog.rb
app/models/city.rb
app/views/blogs/index.html.haml
app/views/blogs/show.html.haml
app/views/partial/_filter.html.haml
config/routes.rb