Core: Merge Find and Locator into Core plugin

Change-Id: I7053310272235d854c9f409670ff52a10a7add8b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

src/plugins/coreplugin/coreplugin.h

@@ -33,11 +33,15 @@
 #include <extensionsystem/iplugin.h>
 
 namespace Core {
+
 class DesignMode;
+class FindPlugin;
+
 namespace Internal {
 
 class EditMode;
 class MainWindow;
+class LocatorPlugin;
 
 class CorePlugin : public ExtensionSystem::IPlugin
 {
@@ -69,6 +73,8 @@ private:
     MainWindow *m_mainWindow;
     EditMode *m_editMode;
     DesignMode *m_designMode;
+    FindPlugin *m_findPlugin;
+    LocatorPlugin *m_locatorPlugin;
 };
 
 } // namespace Internal