Merge remote-tracking branch 'origin/liana/course-creator-improvements'

Merge remote-tracking branch 'origin/liana/course-creator-improvements'

# Conflicts:
#	python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/handlers/CCLessonMoveHandlerDelegate.java
#	python/educational-core/student/resources/META-INF/plugin.xml
#	python/educational-core/student/src/com/jetbrains/edu/learning/StudyPluginConfigurator.java
#	python/educational-core/student/src/com/jetbrains/edu/learning/StudyProjectComponent.java
#	python/educational-core/student/src/com/jetbrains/edu/learning/StudyTaskManager.java
#	python/educational-core/student/src/com/jetbrains/edu/learning/StudyUtils.java
#	python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyEditorFactoryListener.java
#	python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudySwingToolWindow.java