PY-13566 Create step definition doesn't create step
Merge remote-tracking branch 'origin/master'

Conflicts:
	cucumber/src/org/jetbrains/plugins/cucumber/inspections/CucumberCreateStepFix.java
WEB-12876 Dart syntax coloring is broken when line comment is added
Merge remote-tracking branch 'origin/master'
phonegap a lot of changes