initial
next + merge
#CO-37 in progress
Merge branch 'master' into contentFolderTypeRework

Conflicts:
	platform/compiler-impl/src/com/intellij/compiler/impl/TranslatingCompilerFilesMonitor.java
fixes after merge
#CO-37 fixed