-
-
Merge branch 'new-tagger' of https://github.com/Siansor/Kartinka into new-tagger

Conflicts:
	.idea/Kartinka.iml
	app/controllers/application_controller.rb
	app/controllers/images_controller.rb
	app/models/image.rb
	app/models/user.rb
	app/views/application/_admin_header_menu.html.haml
	app/views/application/_shop_header_menu.html.haml
	app/views/application/_site_header_menu.html.haml
	app/views/images/index.html.haml
	app/views/layouts/application.html.haml
	app/views/sites/_form.html.haml
	app/views/sites/balance.html.haml
	app/views/sites/edit.html.haml
	app/views/sites/index.html.haml
	app/views/sites/statistic.html.haml
	config/routes.rb
	db/schema.rb
	public/embed.js
added more translatopm