Merge branch 'feature/fix_union_locale-49' into develop
Merge branch 'feature/number_photo_at_photoalbum-47' into develop

Conflicts:
	db/schema.rb
add airbrake
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
refactoring
some refactoring
cache mehod (refctoting)
fixed
fix locale
Merge branch 'develop' of github.com:kaize/castle into feature/correct_main_page-51

Conflicts:
	app/controllers/web/instructors_controller.rb
	app/views/layouts/web/shared/_navbar.html.haml
add locale for activity
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
merge fixes