NPE fixed
EA-62934
Throw NoDataException instead of IOOBE if source file has unexpected number of lines
NoSuchElementException fixed
EA-60921
 {XML in Scala Worksheet can not compile} #SCL-7935 fixed (and probably others related to messed worksheet classpath bugs too)
Diagnostic for TypeAliasDefinition is null.
(cherry picked from commit 650aa21)
Worksheet: Caching ClassLoader for worksheet running in the compiler server process
Worksheet: Worksheet server runner refactoring
{Worksheet does not evaluate with Scala 2.11 and -Xfuture -Xfatal-warnings} #SCL-6959 fixed
Merge remote-tracking branch 'origin/master'
= cleaned up SbtSettings
= fixed sbt version detection for complex IDEA projects built from
    multiple SBT projects using `Import module` command
+ merged implicit imports and resolvers forms into one SBT form
= fixed non-working update button in resolvers pane
= moved SBT runner -> SBT Global settings
= refactored various settings classes
= moved form labels into bundle
Merge branch 'master' of github.com:JetBrains/intellij-scala
StackOverflow in collecting local parameters fixed
Rest of #SCL-7741 fixed
= changed priority of JDKs when importing/refreshing SBT project
Worksheet: bug when action buttons aren't updated after dumb mode fixed
Merge remote-tracking branch 'origin/master'