Merge branches 'master' and 'pycharm/folding' of git.labs.intellij.net:idea/community

# Conflicts:
#	python/src/META-INF/python-core.xml

diff --cc python/src/META-INF/python-core.xml
index 5ba9c42250b3a334ac620a47131d355ea8b1ffba,3e4ba4cb5750887d2e97db52c8b869fbd9dcbf9a..58c6d91fa15463995179401147f61ebf6f458811
--- 1/python/src/META-INF/python-core.xml
--- 2/python/src/META-INF/python-core.xml
+++ b/python/src/META-INF/python-core.xml
@@@ -577,7 -572,11 +577,13 @@@
  
      <lang.inspectionSuppressor language="Python" implementationClass="com.jetbrains.python.inspections.PyInspectionsSuppressor"/>
      <refactoring.invertBoolean implementation="com.jetbrains.python.refactoring.invertBoolean.PyInvertBooleanDelegate"/>
+ 
 +    <backspaceHandlerDelegate implementation="com.jetbrains.python.codeInsight.editorActions.PyTripleQuoteBackspaceDelegate"/>
++
+     <!--folding-->
+     <codeFoldingOptionsProvider instance="com.jetbrains.python.PythonFoldingOptionsProvider"/>
+     <applicationService serviceInterface="com.jetbrains.python.PythonFoldingSettings"
+                         serviceImplementation="com.jetbrains.python.PythonFoldingSettings"/>
    </extensions>
  
    <extensionPoints>
@@@ -659,13 -657,7 +665,13 @@@
      <typeProvider implementation="com.jetbrains.python.debugger.PyCallSignatureTypeProvider"/>
      <pyReferenceResolveProvider implementation="com.jetbrains.python.psi.resolve.PythonBuiltinReferenceResolveProvider"/>
  
-     
 +    <!-- NumPy -->
 +    <pyModuleMembersProvider implementation="com.jetbrains.numpy.codeInsight.NumpyModuleMembersProvider"/>
 +    <typeProvider implementation="com.jetbrains.numpy.codeInsight.NumpyDocStringTypeProvider"/>
 +    <resolveResultRater implementation="com.jetbrains.numpy.codeInsight.NumpyResolveRater"/>
++
      <!-- PyDocstring -->
 +    <typeProvider implementation="com.jetbrains.python.documentation.docstrings.PyDocStringTypeProvider"/>
      <dialectsTokenSetContributor implementation="com.jetbrains.python.documentation.doctest.PyDocstringTokenSetContributor"/>
      <visitorFilter language="PyDocstring" implementationClass="com.jetbrains.python.documentation.doctest.PyDocstringVisitorFilter"/>