Merge remote-tracking branch 'origin/master' into skr-merge

# Conflicts:
#	platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java

diff --cc platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
Simple merge

diff --cc platform/lang-impl/src/com/intellij/ide/todo/TodoTreeBuilder.java
Simple merge

diff --cc platform/platform-api/src/com/intellij/ui/components/JBOptionButton.java
Simple merge

diff --cc platform/platform-resources/src/META-INF/LangExtensions.xml
Simple merge

diff --cc platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java
Simple merge