add style for faq.html, privacy..
add style for search (but not all most ready)
general rating
add general rating for hotels
Merge pull request #50 from Verkalets/add-general-rating

Add general rating
comp off_1
add filter for hotels
add style for blog
add style for cities(tabs: City Guides, Maps), without fix tab and images
add uploader for City
add uploader for Place(not add place)
add/fix blogs and blog_comments for city
fix blogs
add cat cit blog!!!
Merge pull request #51 from Verkalets/add-filter

Add filter
fix blog_category#show
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
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
Merge pull request #52 from Verkalets/34-frontend

34 frontend
Merge branch 'dev' into add-filter-field

Conflicts:
	app/models/hotel.rb
	app/views/search/index.html.haml