fix staging config
Merge branch 'feature/disign_fix_#66_#67' into staging
Merge branch 'feature/update_rails' into staging
Merge branch 'develop' into staging
Merge branch 'feature/subscribe_course_attribute_#65' into staging
fix merge conflict
Merge branch 'feature/full_text_searching_#42' into staging
fix sphinx config
merge conflict fix
Merge branch 'feature/full_text_searching_#42' into staging
debug capistrano
fix capistrano deploy config
Merge branch 'feature/full_text_searching_#42' into staging

Conflicts:
	config/sphinx.yml
debug deploy config
Merge branch 'feature/full_text_searching_#42' into staging
Merge branch 'feature/add_block_my_corses_#38' into staging

Conflicts:
	config/locales/ru.yml
Merge branch 'feature/full_text_searching_#42' into staging
Merge branch 'feature/add_block_my_corses_#38' into staging
Merge branch 'feature/full_text_searching_#42' into staging
Merge branch 'feature/hide_courses_with_state_unpublish_#70' into staging

Conflicts:
	app/views/layouts/web/shared/_courses_nav.html.haml
	app/views/web/courses/index.html.haml