rename InjectedLanguageFacadeImpl back to InjectedLanguageUtil. Move method getInjectedPsiFiles from InjectedLanguageUtil to injectedLanguageManager. Move InjectedLanguageManager to core-api
move DefinitionsSearch to indexing-api
DefinitionsSearch.EP_NAME
New module: java-indexing-api
move searchers to indexing module
more dependencies
public ctor
move java searching stuff to indexing module
Fix test
merge with master
Merge branch 'master' into upsource-master

Conflicts:
	java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertAbsolutePathToRelativeIntentionAction.java
	java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ConvertColorRepresentationTest.java
	jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java
	jps/model/src/org/jetbrains/ether/dependencyView/IntIntMultiMaplet.java
	jps/model/src/org/jetbrains/ether/dependencyView/IntObjectMultiMaplet.java
	jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java
	platform/lang-api/src/com/intellij/codeInsight/intention/PsiElementBaseIntentionAction.java
	platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java
	platform/platform-impl/src/com/intellij/featureStatistics/actions/ShowFeatureUsageStatisticsDialog.java
	platform/util/src/com/intellij/util/CommonProcessors.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java
	plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/CreateFieldFromParameterTest.groovy
	plugins/groovy/test/org/jetbrains/plugins/groovy/lang/controlFlow/ControlFlowTest.java
fix compilation after merge
Merge branch 'master' into upsource-master
Fire 'project loaded' events in core/mock environment
Extract superclass from ModuleUtil and place it into projectModel module
extract FindSuperElementsHelper
restore directory index initialization in CoreProjectLoader
Merge branch 'master' into upsource-master
Merge branch 'master' into upsource-master
Merge branch 'master' into upsource-master

Conflicts:
	build/scripts/libLicenses.gant
	images/src/org/intellij/images/index/ImageInfoIndex.java
	java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
	java/execution/impl/src/com/intellij/execution/actions/AbstractRerunFailedTestsAction.java
	jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java
	jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
	jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildDataManager.java
	jps/jps-builders/src/org/jetbrains/jps/javac/JavacMain.java
	jps/jps-builders/src/org/jetbrains/jps/javac/OptimizedFileManager.java
	jps/jps-builders/src/org/jetbrains/jps/javac/OptimizedFileManager17.java
	jps/model/src/org/jetbrains/jps/idea/IdeaProjectLoader.groovy
	platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironment.java
	platform/lang-impl/src/com/intellij/codeInsight/editorActions/CopyPasteIndentProcessor.java
	platform/platform-impl/src/com/intellij/featureStatistics/actions/ShowFeatureUsageStatisticsDialog.java
	platform/platform-resources-en/src/messages/ActionsBundle.properties
	platform/util/src/com/intellij/icons/AllIcons.java
	plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataHighlightingPass.java
	plugins/java-i18n/src/com/intellij/spellchecker/LiteralExpressionTokenizer.java
	plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationType.java
	plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/EscapeSequenceTokenizer.java