Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'

Conflicts:
	python/educational/course-creator/src/com/jetbrains/edu/coursecreator/CCProjectGeneratorUtil.java
	python/educational/interactive-learning/src/com/jetbrains/edu/learning/StudyDocumentListener.java
	python/educational/interactive-learning/src/com/jetbrains/edu/learning/StudyEditorFactoryListener.java
	python/educational/interactive-learning/src/com/jetbrains/edu/learning/actions/StudyRefreshTaskFileAction.java
	python/educational/interactive-learning/src/com/jetbrains/edu/learning/course/AnswerPlaceholder.java