staging enviroment
del database.yml
fix staging branch
fix app dir
merge develop
Merge branch 'develop' into staging

* develop:
  tmp remove airbrake
Merge remote-tracking branch 'origin/feature/schedules_for_union' into staging
Merge branch 'feature/schedules_for_union' into staging
Merge branch 'feature/schedules_for_union' into staging
Merge branch 'feature/schedules_for_union' into staging
Merge branch 'feature/schedules_for_union' into staging
Merge branch 'feature/disqus' into staging

Conflicts:
	.travis.yml
	app/views/web/news/show.html.haml
хз че
Merge branch 'feature/instructors_to_groups' into staging

Conflicts:
	.gitignore
	db/seeds.rb
Merge branch 'feature/27_scroll_spy' into staging

Conflicts:
	app/views/layouts/web/application.html.haml
Merge branch 'feature/disqus' into staging

Conflicts:
	app/views/web/news/show.html.haml
Merge branch 'feature/design_edit_29' into staging
Merge branch 'feature/translate_admin_panel_#30' into staging
Merge branch 'feature/refactoring_#25' into staging

Conflicts:
	app/views/web/categories/unions/groups/show.html.haml
	config/locales/custom.ru.yml
	config/routes.rb
fix haml