SCL-4756 {wrong identifier in interpolated string}
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/org/jetbrains/plugins/scala/lang/lexer/core/_ScalaCoreLexer.java
	src/org/jetbrains/plugins/scala/lang/lexer/core/_ScalaSplittingLexer.java
SCL-5325 {Use of $this in string interpolation breaks highlighting of subsequent interpolated values}
SCL-5291 {Multiline strings first line bug}
Merge remote-tracking branch 'origin/master'
Import optimization refactoring (for play 2)