Better token filtering in LayeredParser (for native xml problem in SCL-5162 {Play 2 Scala Template: Some false positive errors} ) (cherry-picked)
Fixed ME.
(cherry picked from commit c3e8233)
Merge remote-tracking branch 'origin/master.release' into master.release
Merge branch 'master' into master.release
Merge remote-tracking branch 'origin/master.release' into master.release

Conflicts:
	src/org/jetbrains/plugins/scala/lang/parser/util/LayeredParser.java
LocalServer: better synchronization
(cherry picked from commit 7589f69)
Use JavaBuilder.addCompilationOptions to create Javac options
(cherry picked from commit c56a44b)
More fixed and performance improvements #SCL-5472 Comment
Bug with introduce variable fixed
#SCL-6024 fixed
(cherry picked from commit 4b7ec54)
Explicitly add common Javac options in CompilationData #SCL-6043
(cherry picked from commit c481563)
Fixed deadlock in stubs (cherry picked from commit 68860ca)
Dummy identifier patched for backticked references #SCL-5335 Fixed
Merge branch 'master' into master.release

Conflicts:
	src/org/jetbrains/plugins/scala/decompiler/DecompilerUtil.scala
	src/org/jetbrains/plugins/scala/lang/completion/ScalaCompletionContributor.scala
Content is identical now with master branch.
Merge branch 'master.release'
reverted wrong fix
Do not load tree element.
(cherry picked from commit 657171b)
Improvements for stubs
(cherry picked from commit ac902b4)
Fixed compilation
(cherry picked from commit 901b43d)
Removed weird code.