Merge branch 'master' into feature/phpstorm-meta-v121

Author: King2500

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "src/main/resources/symfony-meta"]
 	path = src/main/resources/symfony-meta
 	url = https://github.com/King2500/symfony-phpstorm-meta.git
+[submodule "src/main/resources/doctrine-meta"]
+	path = src/main/resources/doctrine-meta
+	url = https://github.com/King2500/doctrine-phpstorm-meta.git

src/main/resources/META-INF/plugin.xml

@@ -121,6 +121,7 @@
         <typeProvider3 implementation="fr.adrienbrault.idea.symfony2plugin.doctrine.ObjectManagerFindTypeProvider"/>
         <typeProvider3 implementation="fr.adrienbrault.idea.symfony2plugin.assistant.signature.MethodSignatureTypeProvider"/>
         <libraryRoot id="symfony_meta" path="/symfony-meta/" runtime="false"/>
+        <libraryRoot id="doctrine_meta" path="/doctrine-meta/" runtime="false"/>
     </extensions>
 
     <extensions defaultExtensionNs="com.intellij">