File annotated statistics.
Merge branch 'master' into master.release

Conflicts:
	META-INF/plugin.xml
	SBT/src/main/scala/org/jetbrains/sbt/Sbt.scala
	SBT/src/main/scala/org/jetbrains/sbt/project/SbtProjectResolver.scala
	src/org/jetbrains/plugins/scala/lang/psi/api/base/ScReferenceElement.scala
	src/org/jetbrains/plugins/scala/statistics/ScalaApplicationUsagesCollector.scala
	src/org/jetbrains/plugins/scala/worksheet/processor/WorksheetSourceProcessor.scala
Merge remote-tracking branch 'origin/master.release' into master.release

Conflicts:
	.idea/libraries/community_plugins.xml
	SBT/src/main/scala/org/jetbrains/sbt/Sbt.scala
	SBT/src/main/scala/org/jetbrains/sbt/language/SbtFileImpl.scala
	SBT/src/main/scala/org/jetbrains/sbt/project/SbtProjectResolver.scala
	src/org/jetbrains/plugins/scala/actions/ShowTypeInfoAction.scala
	src/org/jetbrains/plugins/scala/lang/refactoring/introduceVariable/ScalaIntroduceVariableHandler.scala
	src/org/jetbrains/plugins/scala/worksheet/server/WorksheetRemoteServerRunner.scala
Cleanup
Fixed problems with override/implement of protected methods.
Fixed problems with override/implement of protected methods.
(cherry picked from commit b0aa545)
Fixed test. Right presentation for Java inner static classes in generic parent class.
Fixed test. Right presentation for Java inner static classes in generic parent class.
(cherry picked from commit 1f8ff1c)
minor lexer corrections, full syntax highlighter with color settings page
removed typesafe config from libs
minor
moving back typesafe config as a test dependency
Updated UI for Copy/Paste dialog. #SCL-6976 Fixed
Most specific resolution for extractors #SCL-6978 Fixed
Updated UI for Copy/Paste dialog. #SCL-6976 Fixed
(cherry picked from commit 2a30a11)
Most specific resolution for extractors #SCL-6978 Fixed
(cherry picked from commit 6291781)
Fixed NPE
Fixed MatchError
Fixed NPE
(cherry picked from commit 4db3670)
Fixed MatchError
(cherry picked from commit 2020078)