Merge branch 'feature/number_photo_at_photoalbum-47' into staging

Conflicts:
	db/schema.rb
Merge branch 'feature/fix_union_locale-49' into staging
fixed_vizivig-48
Merge branch 'feature/fix_css_vizivig-48' into staging
add tests for activity
add activity
add activity at navbar
add locales
add routes and schema
add view for users
refactoring
add locale for activity
Merge branch 'feature/add_activity-41' into staging

Conflicts:
	db/schema.rb
refactoring
some refactoring
Merge branch 'feature/add_activity-41' into staging
Merge branch 'feature/event_calendar_42' into staging

Conflicts:
	app/assets/javascripts/application.js
	app/controllers/web/welcome_controller.rb
	app/models/event.rb
	app/views/web/welcome/index.html.haml
fixed_breadcrumbs
Merge branch 'feature/correct_main_page-51' into staging
Merge branch 'feature/correct_main_page-51' into staging

Conflicts:
	Gemfile
	app/controllers/web/activities/application_controller.rb
	app/views/layouts/web/shared/_navbar.html.haml
	config/locales/activerecord.ru.yml
	config/locales/custom.ru.yml
	db/schema.rb