refactoring migration
Merge branch 'feature/update_rails' into develop
refactoring
add block my courses
Merge branch 'feature/add_block_my_corses_#38' into staging

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