diff --git a/plugins/LICENSE.txt b/plugins/LICENSE.txt
@@ -0,0 +1,86 @@
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT�S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+    a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+    b) in the case of each subsequent Contributor:
+
+    i)changes to the Program, and
+
+    ii)additions to the Program;
+
+    where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor�s behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient�s responsibility to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+    a) it complies with the terms and conditions of this Agreement; and
+
+    b) its license agreement:
+
+    i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+
+    ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+
+    iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+    iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+    a) it must be made available under this Agreement; and
+
+    b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor�s responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient�s patent(s), then such Recipient�s rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient�s rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient�s rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient�s obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. 
diff --git a/plugins/com.python.pydev.analysis/META-INF/MANIFEST.MF b/plugins/com.python.pydev.analysis/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Analysis Plug-in
 Bundle-SymbolicName: com.python.pydev.analysis; singleton:=true
 Bundle-Version: 0.9.7.1
 Bundle-Activator: com.python.pydev.analysis.AnalysisPlugin
-Bundle-Vendor: Aptana, Inc.
+Bundle-Vendor: Aptana
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

diff --git a/.../com.python.pydev.analysis/src/com/python/pydev/analysis/AbstractAnalysisPreferences.java b/.../com.python.pydev.analysis/src/com/python/pydev/analysis/AbstractAnalysisPreferences.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis;
 
 import java.util.HashMap;

diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/AnalysisPlugin.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/AnalysisPlugin.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis;
 
 import java.io.File;

diff --git a/...om.python.pydev.analysis/src/com/python/pydev/analysis/AnalysisPreferenceInitializer.java b/...om.python.pydev.analysis/src/com/python/pydev/analysis/AnalysisPreferenceInitializer.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 24/07/2005
  */

diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/AnalysisPreferences.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/AnalysisPreferences.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 24/07/2005
  */

diff --git a/...ython.pydev.analysis/src/com/python/pydev/analysis/CtxInsensitiveImportComplProposal.java b/...ython.pydev.analysis/src/com/python/pydev/analysis/CtxInsensitiveImportComplProposal.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 16/09/2005
  */

diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/IAnalysisPreferences.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/IAnalysisPreferences.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 24/07/2005
  */
@@ -19,6 +25,7 @@ public interface IAnalysisPreferences {
     public static final int TYPE_UNUSED_PARAMETER           = 10;
     public static final int TYPE_NO_EFFECT_STMT             = 11;
     public static final int TYPE_INDENTATION_PROBLEM        = 12;
+    public static final int TYPE_UNDEFINED_VARIABLE_IN_SELF = 13; //Generated on demand by the tdd actions
 
 
     public static final String MSG_TO_IGNORE_TYPE_UNUSED_IMPORT              = "@UnusedImport";

diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/IAnalyzer.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/IAnalyzer.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 19/07/2005
  */

diff --git a/...hon/pydev/analysis/ctrl_1/MarkerStub.java → ...com/python/pydev/analysis/MarkerStub.java b/...hon/pydev/analysis/ctrl_1/MarkerStub.java → ...com/python/pydev/analysis/MarkerStub.java
@@ -1,7 +1,13 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 24/09/2005
  */
-package com.python.pydev.analysis.ctrl_1;
+package com.python.pydev.analysis;
 
 import java.util.Map;
 

diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/OccurrencesAnalyzer.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/OccurrencesAnalyzer.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 19/07/2005
  */

diff --git a/...m.python.pydev.analysis/src/com/python/pydev/analysis/actions/AdditionalInfoAndIInfo.java b/...m.python.pydev.analysis/src/com/python/pydev/analysis/actions/AdditionalInfoAndIInfo.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.actions;
 
 import com.python.pydev.analysis.additionalinfo.AbstractAdditionalInterpreterInfo;

diff --git a/...m.python.pydev.analysis/src/com/python/pydev/analysis/actions/AnalyzeOnRequestSetter.java b/...m.python.pydev.analysis/src/com/python/pydev/analysis/actions/AnalyzeOnRequestSetter.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.actions;
 
 import java.util.ListResourceBundle;

diff --git a/...com.python.pydev.analysis/src/com/python/pydev/analysis/actions/GlobalsDialogFactory.java b/...com.python.pydev.analysis/src/com/python/pydev/analysis/actions/GlobalsDialogFactory.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.actions;
 
 import java.util.ArrayList;

diff --git a/...n.pydev.analysis/src/com/python/pydev/analysis/actions/GlobalsTwoPaneElementSelector.java b/...n.pydev.analysis/src/com/python/pydev/analysis/actions/GlobalsTwoPaneElementSelector.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.actions;
 
 import org.eclipse.swt.graphics.Point;

diff --git a/...pydev.analysis/src/com/python/pydev/analysis/actions/GlobalsTwoPanelElementSelector2.java b/...pydev.analysis/src/com/python/pydev/analysis/actions/GlobalsTwoPanelElementSelector2.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 
 package com.python.pydev.analysis.actions;
 

diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/actions/MatchHelper.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/actions/MatchHelper.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.actions;
 
 import java.util.List;

diff --git a/...python.pydev.analysis/src/com/python/pydev/analysis/actions/ModuleIInfoLabelProvider.java b/...python.pydev.analysis/src/com/python/pydev/analysis/actions/ModuleIInfoLabelProvider.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.actions;
 
 import org.eclipse.jface.viewers.LabelProvider;

diff --git a/...m.python.pydev.analysis/src/com/python/pydev/analysis/actions/NameIInfoLabelProvider.java b/...m.python.pydev.analysis/src/com/python/pydev/analysis/actions/NameIInfoLabelProvider.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.actions;
 
 import org.eclipse.jface.viewers.LabelProvider;

diff --git a/...on.pydev.analysis/src/com/python/pydev/analysis/actions/NameIInfoStyledLabelProvider.java b/...on.pydev.analysis/src/com/python/pydev/analysis/actions/NameIInfoStyledLabelProvider.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.actions;
 
 import org.eclipse.jface.viewers.StyledString;

diff --git a/...ins/com.python.pydev.analysis/src/com/python/pydev/analysis/actions/PyGlobalsBrowser.java b/...ins/com.python.pydev.analysis/src/com/python/pydev/analysis/actions/PyGlobalsBrowser.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.actions;
 
 import java.util.ArrayList;

diff --git a/...ython.pydev.analysis/src/com/python/pydev/analysis/actions/PyGlobalsBrowserWorkbench.java b/...ython.pydev.analysis/src/com/python/pydev/analysis/actions/PyGlobalsBrowserWorkbench.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on Jun 10, 2006
  * @author Fabio

diff --git a/...alysis/src/com/python/pydev/analysis/additionalinfo/AbstractAdditionalDependencyInfo.java b/...alysis/src/com/python/pydev/analysis/additionalinfo/AbstractAdditionalDependencyInfo.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 28/09/2005
  */

diff --git a/...lysis/src/com/python/pydev/analysis/additionalinfo/AbstractAdditionalInterpreterInfo.java b/...lysis/src/com/python/pydev/analysis/additionalinfo/AbstractAdditionalInterpreterInfo.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 07/09/2005
  */

diff --git a/.../com.python.pydev.analysis/src/com/python/pydev/analysis/additionalinfo/AbstractInfo.java b/.../com.python.pydev.analysis/src/com/python/pydev/analysis/additionalinfo/AbstractInfo.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 07/09/2005
  */

diff --git a/...analysis/src/com/python/pydev/analysis/additionalinfo/AdditionalInfoIntegrityChecker.java b/...analysis/src/com/python/pydev/analysis/additionalinfo/AdditionalInfoIntegrityChecker.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.additionalinfo;
 
 import java.io.File;

diff --git a/...alysis/src/com/python/pydev/analysis/additionalinfo/AdditionalProjectInterpreterInfo.java b/...alysis/src/com/python/pydev/analysis/additionalinfo/AdditionalProjectInterpreterInfo.java
@@ -1,5 +1,10 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
- * License: Common Public License v1.0
  * Created on Sep 13, 2005
  * 
  * @author Fabio Zadrozny

diff --git a/...nalysis/src/com/python/pydev/analysis/additionalinfo/AdditionalSystemInterpreterInfo.java b/...nalysis/src/com/python/pydev/analysis/additionalinfo/AdditionalSystemInterpreterInfo.java
@@ -1,5 +1,10 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
- * License: Common Public License v1.0
  * Created on Sep 13, 2005
  * 
  * @author Fabio Zadrozny

diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/additionalinfo/AttrInfo.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/additionalinfo/AttrInfo.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on Jan 15, 2006
  */

diff --git a/...ins/com.python.pydev.analysis/src/com/python/pydev/analysis/additionalinfo/ClassInfo.java b/...ins/com.python.pydev.analysis/src/com/python/pydev/analysis/additionalinfo/ClassInfo.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 07/09/2005
  */

diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/additionalinfo/DepInfo.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/additionalinfo/DepInfo.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 13/12/2005
  */

diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/additionalinfo/FuncInfo.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/additionalinfo/FuncInfo.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 07/09/2005
  */

diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/additionalinfo/IInfo.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/additionalinfo/IInfo.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 07/09/2005
  */

diff --git a/...s/com.python.pydev.analysis/src/com/python/pydev/analysis/additionalinfo/InfoFactory.java b/...s/com.python.pydev.analysis/src/com/python/pydev/analysis/additionalinfo/InfoFactory.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.additionalinfo;
 
 import java.util.Arrays;

diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/additionalinfo/NameInfo.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/additionalinfo/NameInfo.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on Apr 9, 2006
  */

diff --git a/...nalysis/src/com/python/pydev/analysis/additionalinfo/dependencies/PyStructuralChange.java b/...nalysis/src/com/python/pydev/analysis/additionalinfo/dependencies/PyStructuralChange.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 10/12/2005
  */

diff --git a/...pydev.analysis/src/com/python/pydev/analysis/builder/AbstractAnalysisBuilderRunnable.java b/...pydev.analysis/src/com/python/pydev/analysis/builder/AbstractAnalysisBuilderRunnable.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.builder;
 
 import org.eclipse.core.runtime.IProgressMonitor;

diff --git a/....python.pydev.analysis/src/com/python/pydev/analysis/builder/AnalysisBuilderRunnable.java b/....python.pydev.analysis/src/com/python/pydev/analysis/builder/AnalysisBuilderRunnable.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on Apr 6, 2006
  */

diff --git a/....pydev.analysis/src/com/python/pydev/analysis/builder/AnalysisBuilderRunnableFactory.java b/....pydev.analysis/src/com/python/pydev/analysis/builder/AnalysisBuilderRunnableFactory.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.builder;
 
 import java.util.Collections;

diff --git a/...ydev.analysis/src/com/python/pydev/analysis/builder/AnalysisBuilderRunnableForRemove.java b/...ydev.analysis/src/com/python/pydev/analysis/builder/AnalysisBuilderRunnableForRemove.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.builder;
 
 import org.python.pydev.core.IPythonNature;

diff --git a/...m.python.pydev.analysis/src/com/python/pydev/analysis/builder/AnalysisBuilderVisitor.java b/...m.python.pydev.analysis/src/com/python/pydev/analysis/builder/AnalysisBuilderVisitor.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 23/07/2005
  */

diff --git a/...m.python.pydev.analysis/src/com/python/pydev/analysis/builder/AnalysisParserObserver.java b/...m.python.pydev.analysis/src/com/python/pydev/analysis/builder/AnalysisParserObserver.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 18/09/2005
  */

diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/builder/AnalysisRunner.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/builder/AnalysisRunner.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 18/09/2005
  */

diff --git a/...ev.analysis/src/com/python/pydev/analysis/builder/ClearAnalysisMarkersPyEditListener.java b/...ev.analysis/src/com/python/pydev/analysis/builder/ClearAnalysisMarkersPyEditListener.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.builder;
 
 import java.util.ListResourceBundle;

diff --git a/...python.pydev.analysis/src/com/python/pydev/analysis/builder/IAnalysisBuilderRunnable.java b/...python.pydev.analysis/src/com/python/pydev/analysis/builder/IAnalysisBuilderRunnable.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.builder;
 
 import org.python.pydev.core.concurrency.IRunnableWithMonitor;

diff --git a/...m.python.pydev.analysis/src/com/python/pydev/analysis/builder/KeyForAnalysisRunnable.java b/...m.python.pydev.analysis/src/com/python/pydev/analysis/builder/KeyForAnalysisRunnable.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.builder;
 
 /**

diff --git a/...ev.analysis/src/com/python/pydev/analysis/ctrl_1/AbstractAnalysisMarkersParticipants.java b/...ev.analysis/src/com/python/pydev/analysis/ctrl_1/AbstractAnalysisMarkersParticipants.java
@@ -0,0 +1,79 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
+package com.python.pydev.analysis.ctrl_1;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.python.pydev.core.IPythonNature;
+import org.python.pydev.core.bundle.ImageCache;
+import org.python.pydev.core.docutils.PySelection;
+import org.python.pydev.editor.PyEdit;
+import org.python.pydev.editor.codefolding.MarkerAnnotationAndPosition;
+import org.python.pydev.editor.codefolding.PySourceViewer;
+import org.python.pydev.editor.correctionassist.heuristics.IAssistProps;
+import org.python.pydev.plugin.PydevPlugin;
+
+import com.python.pydev.analysis.AnalysisPreferences;
+import com.python.pydev.analysis.IAnalysisPreferences;
+import com.python.pydev.analysis.builder.AnalysisRunner;
+
+public abstract class AbstractAnalysisMarkersParticipants implements IAssistProps{
+
+    protected ArrayList<IAnalysisMarkersParticipant> participants;
+    protected List<MarkerAnnotationAndPosition> markersAtLine;
+
+    public AbstractAnalysisMarkersParticipants() {
+        participants = new ArrayList<IAnalysisMarkersParticipant>();
+        fillParticipants();
+    }
+
+    protected abstract void fillParticipants();
+
+
+    public List<ICompletionProposal> getProps(PySelection ps, ImageCache imageCache, File f, IPythonNature nature, PyEdit edit, int offset) throws BadLocationException {
+        ArrayList<ICompletionProposal> props = new ArrayList<ICompletionProposal>();
+        IAnalysisPreferences analysisPreferences = AnalysisPreferences.getAnalysisPreferences();
+        String line = ps.getLine();
+
+
+        for (MarkerAnnotationAndPosition marker : markersAtLine) {
+            for (IAnalysisMarkersParticipant participant : participants) {
+                try {
+                    participant.addProps(marker, analysisPreferences, line, ps, offset, nature, edit, props);
+                } catch (Exception e) {
+                    PydevPlugin.log("Error when getting proposals.", e);
+                }
+            }
+        }
+        return props;
+    }
+
+    /**
+     * It is valid if any marker generated from the analysis is found
+     *  
+     * @see org.python.pydev.editor.correctionassist.heuristics.IAssistProps#isValid(org.python.pydev.core.docutils.PySelection, java.lang.String, org.python.pydev.editor.PyEdit, int)
+     */
+    public boolean isValid(PySelection ps, String sel, PyEdit edit, int offset) {
+        PySourceViewer s = edit.getPySourceViewer();
+
+        int line = ps.getLineOfOffset(offset);
+        List<MarkerAnnotationAndPosition> markersAtLine = s.getMarkersAtLine(line, AnalysisRunner.PYDEV_ANALYSIS_PROBLEM_MARKER);
+
+        if(markersAtLine.size() > 0){
+            //store it for later use
+            this.markersAtLine = markersAtLine;
+            return true;
+        }
+
+        return false;
+    }
+
+}
diff --git a/...thon.pydev.analysis/src/com/python/pydev/analysis/ctrl_1/AnalysisMarkersParticipants.java b/...thon.pydev.analysis/src/com/python/pydev/analysis/ctrl_1/AnalysisMarkersParticipants.java
@@ -1,79 +1,22 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 24/09/2005
  */
 package com.python.pydev.analysis.ctrl_1;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.python.pydev.core.IPythonNature;
-import org.python.pydev.core.bundle.ImageCache;
-import org.python.pydev.core.docutils.PySelection;
-import org.python.pydev.editor.PyEdit;
-import org.python.pydev.editor.codefolding.MarkerAnnotationAndPosition;
-import org.python.pydev.editor.codefolding.PySourceViewer;
-import org.python.pydev.editor.correctionassist.heuristics.IAssistProps;
-import org.python.pydev.plugin.PydevPlugin;
-
-import com.python.pydev.analysis.AnalysisPreferences;
-import com.python.pydev.analysis.IAnalysisPreferences;
-import com.python.pydev.analysis.builder.AnalysisRunner;
 
-public class AnalysisMarkersParticipants implements IAssistProps{
+public class AnalysisMarkersParticipants extends AbstractAnalysisMarkersParticipants{
 
-    private List<MarkerAnnotationAndPosition> markersAtLine;
-    private IAnalysisMarkersParticipant ignoreParticipant;
-    private IAnalysisMarkersParticipant fixParticipant;
-    private ArrayList<IAnalysisMarkersParticipant> participants;
 
-    public AnalysisMarkersParticipants() {
-        ignoreParticipant = new IgnoreErrorParticipant();
-        fixParticipant = new UndefinedVariableFixParticipant();
-
-        participants = new ArrayList<IAnalysisMarkersParticipant>();
-        participants.add(ignoreParticipant);
-        participants.add(fixParticipant);
+    protected void fillParticipants() {
+        participants.add(new IgnoreErrorParticipant());
+        participants.add(new UndefinedVariableFixParticipant());
     }
 
-    public List<ICompletionProposal> getProps(PySelection ps, ImageCache imageCache, File f, IPythonNature nature, PyEdit edit, int offset) throws BadLocationException {
-        ArrayList<ICompletionProposal> props = new ArrayList<ICompletionProposal>();
-        IAnalysisPreferences analysisPreferences = AnalysisPreferences.getAnalysisPreferences();
-        String line = ps.getLine();
-
-
-        for (MarkerAnnotationAndPosition marker : markersAtLine) {
-            for (IAnalysisMarkersParticipant participant : participants) {
-                try {
-                    participant.addProps(marker, analysisPreferences, line, ps, offset, nature, edit, props);
-                } catch (Exception e) {
-                    PydevPlugin.log("Error when getting proposals.", e);
-                }
-            }
-        }
-        return props;
-    }
-
-    /**
-     * It is valid if any marker generated from the analysis is found
-     *  
-     * @see org.python.pydev.editor.correctionassist.heuristics.IAssistProps#isValid(org.python.pydev.core.docutils.PySelection, java.lang.String, org.python.pydev.editor.PyEdit, int)
-     */
-    public boolean isValid(PySelection ps, String sel, PyEdit edit, int offset) {
-        PySourceViewer s = edit.getPySourceViewer();
-
-        int line = ps.getLineOfOffset(offset);
-        List<MarkerAnnotationAndPosition> markersAtLine = s.getMarkersAtLine(line, AnalysisRunner.PYDEV_ANALYSIS_PROBLEM_MARKER);
-
-        if(markersAtLine.size() > 0){
-            //store it for later use
-            this.markersAtLine = markersAtLine;
-            return true;
-        }
-
-        return false;
-    }
 
 }
diff --git a/...pydev.analysis/src/com/python/pydev/analysis/ctrl_1/DontAnalyzeFileMarkerParticipant.java b/...pydev.analysis/src/com/python/pydev/analysis/ctrl_1/DontAnalyzeFileMarkerParticipant.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.ctrl_1;
 
 import java.io.File;

diff --git a/...thon.pydev.analysis/src/com/python/pydev/analysis/ctrl_1/IAnalysisMarkersParticipant.java b/...thon.pydev.analysis/src/com/python/pydev/analysis/ctrl_1/IAnalysisMarkersParticipant.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 24/09/2005
  */

diff --git a/....python.pydev.analysis/src/com/python/pydev/analysis/ctrl_1/IgnoreCompletionProposal.java b/....python.pydev.analysis/src/com/python/pydev/analysis/ctrl_1/IgnoreCompletionProposal.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 22/09/2005
  */

diff --git a/...om.python.pydev.analysis/src/com/python/pydev/analysis/ctrl_1/IgnoreErrorParticipant.java b/...om.python.pydev.analysis/src/com/python/pydev/analysis/ctrl_1/IgnoreErrorParticipant.java
@@ -1,5 +1,10 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
- * License: Common Public License v1.0
  * Created on Sep 20, 2005
  * 
  * @author Fabio Zadrozny

diff --git a/....pydev.analysis/src/com/python/pydev/analysis/ctrl_1/UndefinedVariableFixParticipant.java b/....pydev.analysis/src/com/python/pydev/analysis/ctrl_1/UndefinedVariableFixParticipant.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 24/09/2005
  */

diff --git a/...om.python.pydev.analysis/src/com/python/pydev/analysis/indexview/ElementWithChildren.java b/...om.python.pydev.analysis/src/com/python/pydev/analysis/indexview/ElementWithChildren.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.indexview;
 
 import java.util.ArrayList;

diff --git a/.../com.python.pydev.analysis/src/com/python/pydev/analysis/indexview/ElementWithParent.java b/.../com.python.pydev.analysis/src/com/python/pydev/analysis/indexview/ElementWithParent.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.indexview;
 
 public abstract class ElementWithParent implements ITreeElement{

diff --git a/...ins/com.python.pydev.analysis/src/com/python/pydev/analysis/indexview/ForcedLibGroup.java b/...ins/com.python.pydev.analysis/src/com/python/pydev/analysis/indexview/ForcedLibGroup.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.indexview;
 
 import java.util.ArrayList;

diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/indexview/ITreeElement.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/indexview/ITreeElement.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.indexview;
 
 public interface ITreeElement {

diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/indexview/IndexRoot.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/indexview/IndexRoot.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.indexview;
 
 public class IndexRoot implements ITreeElement{

diff --git a/...s/com.python.pydev.analysis/src/com/python/pydev/analysis/indexview/InterpreterGroup.java b/...s/com.python.pydev.analysis/src/com/python/pydev/analysis/indexview/InterpreterGroup.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.indexview;
 
 import java.util.Iterator;

diff --git a/.../com.python.pydev.analysis/src/com/python/pydev/analysis/indexview/InterpretersGroup.java b/.../com.python.pydev.analysis/src/com/python/pydev/analysis/indexview/InterpretersGroup.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.indexview;
 
 import org.python.pydev.core.IInterpreterInfo;

diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/indexview/LeafElement.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/indexview/LeafElement.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.indexview;
 
 public class LeafElement extends ElementWithParent {

diff --git a/...ython.pydev.analysis/src/com/python/pydev/analysis/indexview/MisconfigurationElement.java b/...ython.pydev.analysis/src/com/python/pydev/analysis/indexview/MisconfigurationElement.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.indexview;
 
 import org.python.pydev.core.MisconfigurationException;

diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/indexview/NatureGroup.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/indexview/NatureGroup.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.indexview;
 
 import java.io.File;

diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/indexview/ProjectsGroup.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/indexview/ProjectsGroup.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.indexview;
 
 import org.eclipse.core.resources.IProject;

diff --git a/...python.pydev.analysis/src/com/python/pydev/analysis/indexview/PyIndexContentProvider.java b/...python.pydev.analysis/src/com/python/pydev/analysis/indexview/PyIndexContentProvider.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.indexview;
 
 import org.eclipse.jface.viewers.ITreeContentProvider;

diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/indexview/PyIndexView.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/indexview/PyIndexView.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.indexview;
 
 import org.eclipse.jface.viewers.TreeViewer;

diff --git a/...ins/com.python.pydev.analysis/src/com/python/pydev/analysis/messages/AbstractMessage.java b/...ins/com.python.pydev.analysis/src/com/python/pydev/analysis/messages/AbstractMessage.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 23/07/2005
  */

diff --git a/...ns/com.python.pydev.analysis/src/com/python/pydev/analysis/messages/CompositeMessage.java b/...ns/com.python.pydev.analysis/src/com/python/pydev/analysis/messages/CompositeMessage.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 23/07/2005
  */

diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/messages/IMessage.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/messages/IMessage.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 19/07/2005
  */

diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/messages/Message.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/messages/Message.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 19/07/2005
  */

diff --git a/....python.pydev.analysis/src/com/python/pydev/analysis/organizeimports/OrganizeImports.java b/....python.pydev.analysis/src/com/python/pydev/analysis/organizeimports/OrganizeImports.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 01/06/2008
  */

diff --git a/...ev.analysis/src/com/python/pydev/analysis/organizeimports/OrganizeImportsFixesUnused.java b/...ev.analysis/src/com/python/pydev/analysis/organizeimports/OrganizeImportsFixesUnused.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 25/09/2005
  */

diff --git a/...ev.analysis/src/com/python/pydev/analysis/scopeanalysis/AbstractScopeAnalyzerVisitor.java b/...ev.analysis/src/com/python/pydev/analysis/scopeanalysis/AbstractScopeAnalyzerVisitor.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on May 16, 2006
  */

diff --git a/....analysis/src/com/python/pydev/analysis/scopeanalysis/AstEntryScopeAnalysisConstants.java b/....analysis/src/com/python/pydev/analysis/scopeanalysis/AstEntryScopeAnalysisConstants.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.scopeanalysis;
 
 public class AstEntryScopeAnalysisConstants {

diff --git a/...ydev.analysis/src/com/python/pydev/analysis/scopeanalysis/AttributeReferencesVisitor.java b/...ydev.analysis/src/com/python/pydev/analysis/scopeanalysis/AttributeReferencesVisitor.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.scopeanalysis;
 
 import java.util.Iterator;

diff --git a/.../com.python.pydev.analysis/src/com/python/pydev/analysis/scopeanalysis/ScopeAnalysis.java b/.../com.python.pydev.analysis/src/com/python/pydev/analysis/scopeanalysis/ScopeAnalysis.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.scopeanalysis;
 
 import java.util.ArrayList;

diff --git a/...thon.pydev.analysis/src/com/python/pydev/analysis/scopeanalysis/ScopeAnalyzerVisitor.java b/...thon.pydev.analysis/src/com/python/pydev/analysis/scopeanalysis/ScopeAnalyzerVisitor.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on May 16, 2006
  */

diff --git a/....analysis/src/com/python/pydev/analysis/scopeanalysis/ScopeAnalyzerVisitorForImports.java b/....analysis/src/com/python/pydev/analysis/scopeanalysis/ScopeAnalyzerVisitorForImports.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.scopeanalysis;
 
 import java.util.ArrayList;

diff --git a/...lysis/src/com/python/pydev/analysis/scopeanalysis/ScopeAnalyzerVisitorWithoutImports.java b/...lysis/src/com/python/pydev/analysis/scopeanalysis/ScopeAnalyzerVisitorWithoutImports.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.scopeanalysis;
 
 import java.util.ArrayList;

diff --git a/.../com.python.pydev.analysis/src/com/python/pydev/analysis/scopeanalysis/TokenMatching.java b/.../com.python.pydev.analysis/src/com/python/pydev/analysis/scopeanalysis/TokenMatching.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.scopeanalysis;
 
 import java.util.ArrayList;

diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/tabnanny/TabNanny.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/tabnanny/TabNanny.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.tabnanny;
 
 import java.util.ArrayList;

diff --git a/...com.python.pydev.analysis/src/com/python/pydev/analysis/tabnanny/TabNannyDocIterator.java b/...com.python.pydev.analysis/src/com/python/pydev/analysis/tabnanny/TabNannyDocIterator.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.tabnanny;
 
 import java.util.Iterator;

diff --git a/...s/com.python.pydev.analysis/src/com/python/pydev/analysis/ui/AnalysisPreferencesPage.java b/...s/com.python.pydev.analysis/src/com/python/pydev/analysis/ui/AnalysisPreferencesPage.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 23/07/2005
  */

diff --git a/...om.python.pydev.analysis/src/com/python/pydev/analysis/ui/AutoImportsPreferencesPage.java b/...om.python.pydev.analysis/src/com/python/pydev/analysis/ui/AutoImportsPreferencesPage.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.ui;
 
 import java.util.List;

diff --git a/.../com.python.pydev.analysis/src/com/python/pydev/analysis/visitors/DuplicationChecker.java b/.../com.python.pydev.analysis/src/com/python/pydev/analysis/visitors/DuplicationChecker.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 24/07/2005
  */

diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/visitors/Found.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/visitors/Found.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 23/07/2005
  */

diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/visitors/GenAndTok.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/visitors/GenAndTok.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on May 16, 2006
  */

diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/visitors/ImportChecker.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/visitors/ImportChecker.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 21/08/2005
  */

diff --git a/...ins/com.python.pydev.analysis/src/com/python/pydev/analysis/visitors/MessagesManager.java b/...ins/com.python.pydev.analysis/src/com/python/pydev/analysis/visitors/MessagesManager.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 24/07/2005
  */

diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/visitors/NoSelfChecker.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/visitors/NoSelfChecker.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 28/08/2005
  */

diff --git a/.../com.python.pydev.analysis/src/com/python/pydev/analysis/visitors/OccurrencesVisitor.java b/.../com.python.pydev.analysis/src/com/python/pydev/analysis/visitors/OccurrencesVisitor.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 19/07/2005
  */

diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/visitors/Scope.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/visitors/Scope.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 27/07/2005
  */

diff --git a/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/visitors/ScopeItems.java b/plugins/com.python.pydev.analysis/src/com/python/pydev/analysis/visitors/ScopeItems.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 27/07/2005
  */

diff --git a/...ns/com.python.pydev.analysis/tests/com/python/pydev/analysis/AnalysisPreferencesStub.java b/...ns/com.python.pydev.analysis/tests/com/python/pydev/analysis/AnalysisPreferencesStub.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 24/09/2005
  */

diff --git a/....python.pydev.analysis/tests/com/python/pydev/analysis/AnalysisRequestsTestWorkbench.java b/....python.pydev.analysis/tests/com/python/pydev/analysis/AnalysisRequestsTestWorkbench.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis;
 
 import java.util.ArrayList;

diff --git a/plugins/com.python.pydev.analysis/tests/com/python/pydev/analysis/AnalysisTestsBase.java b/plugins/com.python.pydev.analysis/tests/com/python/pydev/analysis/AnalysisTestsBase.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 01/10/2005
  */

diff --git a/...pydev.analysis/tests/com/python/pydev/analysis/CtxInsensitiveImportComplProposalTest.java b/...pydev.analysis/tests/com/python/pydev/analysis/CtxInsensitiveImportComplProposalTest.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis;
 
 import org.eclipse.jface.text.Document;

diff --git a/...python.pydev.analysis/tests/com/python/pydev/analysis/ImportsOccurrencesAnalyzerTest.java b/...python.pydev.analysis/tests/com/python/pydev/analysis/ImportsOccurrencesAnalyzerTest.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis;
 
 import org.eclipse.core.runtime.NullProgressMonitor;

diff --git a/...s/com.python.pydev.analysis/tests/com/python/pydev/analysis/OccurrencesAnalyzer2Test.java b/...s/com.python.pydev.analysis/tests/com/python/pydev/analysis/OccurrencesAnalyzer2Test.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on Sep 21, 2006
  * @author Fabio

diff --git a/...ython.pydev.analysis/tests/com/python/pydev/analysis/OccurrencesAnalyzerListCompTest.java b/...ython.pydev.analysis/tests/com/python/pydev/analysis/OccurrencesAnalyzerListCompTest.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on Dec 9, 2006
  * @author Fabio

diff --git a/...ns/com.python.pydev.analysis/tests/com/python/pydev/analysis/OccurrencesAnalyzerTest.java b/...ns/com.python.pydev.analysis/tests/com/python/pydev/analysis/OccurrencesAnalyzerTest.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 19/07/2005
  */

diff --git a/...analysis/tests/com/python/pydev/analysis/actions/GlobalsTwoPanelElementSelector2Test.java b/...analysis/tests/com/python/pydev/analysis/actions/GlobalsTwoPanelElementSelector2Test.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.actions;
 
 import org.eclipse.ui.dialogs.SearchPattern;

diff --git a/...is/tests/com/python/pydev/analysis/additionalinfo/AdditionalInfoIntegrityCheckerTest.java b/...is/tests/com/python/pydev/analysis/additionalinfo/AdditionalInfoIntegrityCheckerTest.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.additionalinfo;
 
 import java.io.File;

diff --git a/...ydev.analysis/tests/com/python/pydev/analysis/additionalinfo/AdditionalInfoTestsBase.java b/...ydev.analysis/tests/com/python/pydev/analysis/additionalinfo/AdditionalInfoTestsBase.java
@@ -1,5 +1,10 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
- * License: Common Public License v1.0
  * Created on Sep 12, 2005
  * 
  * @author Fabio Zadrozny
@@ -34,8 +39,8 @@
 import org.python.pydev.plugin.nature.PythonNature;
 
 import com.python.pydev.analysis.AnalysisTestsBase;
+import com.python.pydev.analysis.MarkerStub;
 import com.python.pydev.analysis.builder.AnalysisRunner;
-import com.python.pydev.analysis.ctrl_1.MarkerStub;
 
 public class AdditionalInfoTestsBase extends AnalysisTestsBase {
 

diff --git a/...nalysis/tests/com/python/pydev/analysis/additionalinfo/AdditionalInterpreterInfoTest.java b/...nalysis/tests/com/python/pydev/analysis/additionalinfo/AdditionalInterpreterInfoTest.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 07/09/2005
  */

diff --git a/...python.pydev.analysis/tests/com/python/pydev/analysis/additionalinfo/InfoFactoryTest.java b/...python.pydev.analysis/tests/com/python/pydev/analysis/additionalinfo/InfoFactoryTest.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.additionalinfo;
 
 import javax.xml.parsers.DocumentBuilder;

diff --git a/....analysis/tests/com/python/pydev/analysis/ctrl_1/UndefinedVariableFixParticipantTest.java b/....analysis/tests/com/python/pydev/analysis/ctrl_1/UndefinedVariableFixParticipantTest.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 24/09/2005
  */

diff --git a/...n.pydev.analysis/tests/com/python/pydev/analysis/organizeimports/OrganizeImportsTest.java b/...n.pydev.analysis/tests/com/python/pydev/analysis/organizeimports/OrganizeImportsTest.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 25/09/2005
  */

diff --git a/...dev.analysis/tests/com/python/pydev/analysis/scopeanalysis/ScopeAnalysisCommentsTest.java b/...dev.analysis/tests/com/python/pydev/analysis/scopeanalysis/ScopeAnalysisCommentsTest.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.scopeanalysis;
 
 import java.util.ArrayList;

diff --git a/...ydev.analysis/tests/com/python/pydev/analysis/scopeanalysis/ScopeAnalyzerVisitorTest.java b/...ydev.analysis/tests/com/python/pydev/analysis/scopeanalysis/ScopeAnalyzerVisitorTest.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on May 16, 2006
  */

diff --git a/...ython.pydev.analysis/tests/com/python/pydev/analysis/scopeanalysis/TokenMatchingTest.java b/...ython.pydev.analysis/tests/com/python/pydev/analysis/scopeanalysis/TokenMatchingTest.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.scopeanalysis;
 
 import java.util.ArrayList;

diff --git a/....python.pydev.analysis/tests/com/python/pydev/analysis/tabnanny/TabNannyIteratorTest.java b/....python.pydev.analysis/tests/com/python/pydev/analysis/tabnanny/TabNannyIteratorTest.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.tabnanny;
 
 import junit.framework.TestCase;

diff --git a/plugins/com.python.pydev.analysis/tests/com/python/pydev/analysis/tabnanny/TabNannyTest.java b/plugins/com.python.pydev.analysis/tests/com/python/pydev/analysis/tabnanny/TabNannyTest.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.analysis.tabnanny;
 
 import java.util.List;

diff --git a/plugins/com.python.pydev.codecompletion/META-INF/MANIFEST.MF b/plugins/com.python.pydev.codecompletion/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Codecompletion Plug-in
 Bundle-SymbolicName: com.python.pydev.codecompletion; singleton:=true
 Bundle-Version: 0.9.7.1
 Bundle-Activator: com.python.pydev.codecompletion.CodecompletionPlugin
-Bundle-Vendor: Aptana, Inc.
+Bundle-Vendor: Aptana
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

diff --git a/...ecompletion/src/com/python/pydev/codecompletion/CodeCompletionPreferencesInitializer.java b/...ecompletion/src/com/python/pydev/codecompletion/CodeCompletionPreferencesInitializer.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 24/09/2005
  */

diff --git a/...python.pydev.codecompletion/src/com/python/pydev/codecompletion/CodecompletionPlugin.java b/...python.pydev.codecompletion/src/com/python/pydev/codecompletion/CodecompletionPlugin.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.codecompletion;
 
 import org.eclipse.jface.resource.ImageDescriptor;

diff --git a/...dev.codecompletion/src/com/python/pydev/codecompletion/ctxinsensitive/CtxParticipant.java b/...dev.codecompletion/src/com/python/pydev/codecompletion/ctxinsensitive/CtxParticipant.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 07/09/2005
  */

diff --git a/...odecompletion/src/com/python/pydev/codecompletion/ctxinsensitive/PyConsoleCompletion.java b/...odecompletion/src/com/python/pydev/codecompletion/ctxinsensitive/PyConsoleCompletion.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.codecompletion.ctxinsensitive;
 
 import org.eclipse.jface.text.BadLocationException;

diff --git a/...pletion/src/com/python/pydev/codecompletion/participant/ImportsCompletionParticipant.java b/...pletion/src/com/python/pydev/codecompletion/participant/ImportsCompletionParticipant.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 21/08/2005
  */

diff --git a/...codecompletion/src/com/python/pydev/codecompletion/simpleassist/KeywordsSimpleAssist.java b/...codecompletion/src/com/python/pydev/codecompletion/simpleassist/KeywordsSimpleAssist.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 24/09/2005
  */

diff --git a/...codecompletion/src/com/python/pydev/codecompletion/simpleassist/SimpleAssistProposal.java b/...codecompletion/src/com/python/pydev/codecompletion/simpleassist/SimpleAssistProposal.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.codecompletion.simpleassist;
 
 import java.util.HashSet;

diff --git a/....codecompletion/src/com/python/pydev/codecompletion/ui/CodeCompletionPreferencesPage.java b/....codecompletion/src/com/python/pydev/codecompletion/ui/CodeCompletionPreferencesPage.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 24/09/2005
  */

diff --git a/...ompletion/tests/com/python/pydev/codecompletion/JavaIntegrationPydevComTestWorkbench.java b/...ompletion/tests/com/python/pydev/codecompletion/JavaIntegrationPydevComTestWorkbench.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.codecompletion;
 
 import org.eclipse.core.runtime.CoreException;

diff --git a/...completion/tests/com/python/pydev/codecompletion/ctxinsensitive/StuctureCreationTest.java b/...completion/tests/com/python/pydev/codecompletion/ctxinsensitive/StuctureCreationTest.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 08/09/2005
  */

diff --git a/...decompletion/tests/com/python/pydev/codecompletion/parameter/ParameterCompletionTest.java b/...decompletion/tests/com/python/pydev/codecompletion/parameter/ParameterCompletionTest.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on 08/09/2005
  */

diff --git a/.../tests/com/python/pydev/codecompletion/participant/CompletionParticipantBuiltinsTest.java b/.../tests/com/python/pydev/codecompletion/participant/CompletionParticipantBuiltinsTest.java
@@ -1,5 +1,4 @@
 /*
- * License: Common Public License v1.0
  * Created on 25/08/2005
  * 
  * @author Fabio Zadrozny

diff --git a/...mpletion/tests/com/python/pydev/codecompletion/participant/CompletionParticipantTest.java b/...mpletion/tests/com/python/pydev/codecompletion/participant/CompletionParticipantTest.java
@@ -1,5 +1,10 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
- * License: Common Public License v1.0
  * Created on 25/08/2005
  * 
  * @author Fabio Zadrozny

diff --git a/plugins/com.python.pydev.debug/META-INF/MANIFEST.MF b/plugins/com.python.pydev.debug/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Extensions Debug Plug-in
 Bundle-SymbolicName: com.python.pydev.debug; singleton:=true
 Bundle-Version: 0.9.7.1
 Bundle-Activator: com.python.pydev.debug.DebugPlugin
-Bundle-Vendor: Aptana, Inc.
+Bundle-Vendor: Aptana
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

diff --git a/plugins/com.python.pydev.debug/src/com/python/pydev/debug/DebugPlugin.java b/plugins/com.python.pydev.debug/src/com/python/pydev/debug/DebugPlugin.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.debug;
 
 import org.eclipse.jface.resource.ImageDescriptor;

diff --git a/plugins/com.python.pydev.debug/src/com/python/pydev/debug/DebugPluginPrefsInitializer.java b/plugins/com.python.pydev.debug/src/com/python/pydev/debug/DebugPluginPrefsInitializer.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.debug;
 
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;

diff --git a/plugins/com.python.pydev.debug/src/com/python/pydev/debug/actions/EndDebugServer.java b/plugins/com.python.pydev.debug/src/com/python/pydev/debug/actions/EndDebugServer.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.debug.actions;
 
 import org.eclipse.jface.action.IAction;

diff --git a/plugins/com.python.pydev.debug/src/com/python/pydev/debug/actions/StartDebugServer.java b/plugins/com.python.pydev.debug/src/com/python/pydev/debug/actions/StartDebugServer.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.debug.actions;
 
 import org.eclipse.jface.action.IAction;

diff --git a/...python.pydev.debug/src/com/python/pydev/debug/console/EvaluationConsoleInputListener.java b/...python.pydev.debug/src/com/python/pydev/debug/console/EvaluationConsoleInputListener.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.debug.console;
 
 import org.eclipse.core.runtime.IAdaptable;

diff --git a/plugins/com.python.pydev.debug/src/com/python/pydev/debug/model/ProcessServer.java b/plugins/com.python.pydev.debug/src/com/python/pydev/debug/model/ProcessServer.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.debug.model;
 
 import java.io.InputStream;

diff --git a/...ns/com.python.pydev.debug/src/com/python/pydev/debug/model/ProcessServerOutputStream.java b/...ns/com.python.pydev.debug/src/com/python/pydev/debug/model/ProcessServerOutputStream.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.debug.model;
 
 import java.io.ByteArrayOutputStream;

diff --git a/plugins/com.python.pydev.debug/src/com/python/pydev/debug/model/PyDebugTargetServer.java b/plugins/com.python.pydev.debug/src/com/python/pydev/debug/model/PyDebugTargetServer.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.debug.model;
 
 import org.eclipse.core.runtime.IPath;

diff --git a/plugins/com.python.pydev.debug/src/com/python/pydev/debug/model/XMLMessage.java b/plugins/com.python.pydev.debug/src/com/python/pydev/debug/model/XMLMessage.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 /*
  * Created on May 20, 2006
  */

diff --git a/plugins/com.python.pydev.debug/src/com/python/pydev/debug/remote/RemoteDebuggerServer.java b/plugins/com.python.pydev.debug/src/com/python/pydev/debug/remote/RemoteDebuggerServer.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.debug.remote;
 
 import java.io.IOException;

diff --git a/...n.pydev.debug/src/com/python/pydev/debug/remote/client_api/PydevRemoteDebuggerServer.java b/...n.pydev.debug/src/com/python/pydev/debug/remote/client_api/PydevRemoteDebuggerServer.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.debug.remote.client_api;
 
 import org.eclipse.core.resources.IResource;

diff --git a/plugins/com.python.pydev.debug/src/com/python/pydev/debug/ui/DebugPreferencesPageExt.java b/plugins/com.python.pydev.debug/src/com/python/pydev/debug/ui/DebugPreferencesPageExt.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.debug.ui;
 
 import org.eclipse.jface.preference.IntegerFieldEditor;

diff --git a/...ebug/src/com/python/pydev/debug/ui/launching/PydevdServerLaunchConfigurationDelegate.java b/...ebug/src/com/python/pydev/debug/ui/launching/PydevdServerLaunchConfigurationDelegate.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.debug.ui.launching;
 
 import java.util.HashMap;

diff --git a/...ython.pydev.debug/src/com/python/pydev/debug/ui/launching/PydevdServerLaunchShortcut.java b/...ython.pydev.debug/src/com/python/pydev/debug/ui/launching/PydevdServerLaunchShortcut.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.debug.ui.launching;
 
 import org.eclipse.core.resources.IProject;

diff --git a/...om.python.pydev.debug/tests/com/python/pydev/debug/model/MyByteArrayOutputStreamTest.java b/...om.python.pydev.debug/tests/com/python/pydev/debug/model/MyByteArrayOutputStreamTest.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.debug.model;
 
 import org.python.pydev.core.MyByteArrayOutputStream;

diff --git a/...ests/com/python/pydev/debug/remote/client_api/PydevRemoteDebuggerServerTestWorkbench.java b/...ests/com/python/pydev/debug/remote/client_api/PydevRemoteDebuggerServerTestWorkbench.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2005-2011 by Appcelerator, Inc. All Rights Reserved.
+ * Licensed under the terms of the Eclipse Public License (EPL).
+ * Please see the license.txt included with this distribution for details.
+ * Any modifications to this file must keep this entire header intact.
+ */
 package com.python.pydev.debug.remote.client_api;
 
 import org.python.pydev.editor.codecompletion.revisited.javaintegration.AbstractWorkbenchTestCase;

diff --git a/plugins/com.python.pydev.docs/apache_notes.txt b/plugins/com.python.pydev.docs/apache_notes.txt
@@ -1,20 +1,20 @@
-To enable .htacces to work:
-
-sudo a2enmod rewrite
-
-And at /etc/apache2/sites-available/default, set AllowOverride:
-
- <Directory /var/www/>
-         Options Indexes FollowSymLinks MultiViews
-         AllowOverride All
-         Order allow,deny
-         allow from all
- </Directory>
-
-Restart,stop,start
-/etc/init.d/apache2 restart
-/etc/init.d/apache2 start
-/etc/init.d/apache2 stop
-
-find /var/www -type d -exec chmod 755 {} \;
+To enable .htacces to work:
+
+sudo a2enmod rewrite
+
+And at /etc/apache2/sites-available/default, set AllowOverride:
+
+ <Directory /var/www/>
+         Options Indexes FollowSymLinks MultiViews
+         AllowOverride All
+         Order allow,deny
+         allow from all
+ </Directory>
+
+Restart,stop,start
+/etc/init.d/apache2 restart
+/etc/init.d/apache2 start
+/etc/init.d/apache2 stop
+
+find /var/www -type d -exec chmod 755 {} \;
 find /var/www -type f -exec chmod 644 {} \;
diff --git a/plugins/com.python.pydev.docs/merged_homepage/developers.contents.html b/plugins/com.python.pydev.docs/merged_homepage/developers.contents.html
@@ -24,13 +24,22 @@ <h1><a class="toc-backref" href="#id1">Getting the code</a></h1>
 To do this, go to <strong>window &gt; preferences &gt; Java &gt; compiler</strong> and change that setting from <strong>1.4 to 5.0</strong>.</p>
 <div class="section" id="repository">
 <h2><a class="toc-backref" href="#id2">Repository</a></h2>
-<p>Get the code with Git from <a class="reference external" href="https://github.com/aptana/Pydev">https://github.com/aptana/Pydev</a> (or you may browse it to get a zip with the contents)</p>
-<p>And later go to: <strong>File &gt; Import &gt; Existing projects into workspace</strong> and point it to the root of the repository you just downloaded.</p>
+<p>Get the code with Git from <a class="reference external" href="https://github.com/aptana/Pydev">https://github.com/aptana/Pydev</a> (ideally, fork it at github, create your own branch at the
+forked repository -- usually based in the development branch -- and later send a pull request on github so that
+the code can be merged back). Later, if you want to provide some other feature/bugfix, a new branch should be created again.</p>
+<p>Then, in Eclipse, go to: <strong>File &gt; Import &gt; Existing projects into workspace</strong> and point it to the root of the repository you just downloaded.</p>
+<p>Note that currently Pydev has a project (org.python.pydev.red_core) which has a dependency on Aptana Studio 3, so, if
+you plan on doing a local build, you'll need to get Aptana Studio 3 installed as a plugin in the SDK used for the build
+(i.e.: not necessarily in the SDK you use for developing), now if you don't need to do a local build
+(i.e.: just do your local changes and run Eclipse with your changes from within the SDK and contribute that
+as a patch later on), you can just close this project so that it doesn't get compiled.</p>
 </div>
 </div>
 <div class="section" id="configuring-the-environment-after-getting-the-code">
 <h1><a class="toc-backref" href="#id3">Configuring the environment after getting the code</a></h1>
-<p>After you do that, you'll probably note that the tests did <strong>not compile successfully</strong>. This is because there are some settings
+<p>Important: Before doing any changes to the code it's important to note that you should create a new branch for doing code changes.
+See: <a class="reference external" href="http://book.git-scm.com/3_basic_branching_and_merging.html">http://book.git-scm.com/3_basic_branching_and_merging.html</a> and also <a class="reference external" href="http://nvie.com/git-model">http://nvie.com/git-model</a> for details on creating and using branches.</p>
+<p>After getting the code, you'll probably note that the tests did <strong>not compile successfully</strong>. This is because there are some settings
 that will depend on your installation, and this settings are stored in a class that holds that info (which you'll have to create).</p>
 <p>There is a 'template' for that file at:</p>
 <p><strong>org.python.pydev.core/tests/org.python.pydev.core/TestDependent.OS.template</strong>. You should create a copy of that file in that same dir named
@@ -39,7 +48,7 @@ <h1><a class="toc-backref" href="#id3">Configuring the environment after getting
 <blockquote>
 <ul class="simple">
 <li>There is something missing in that TestDependent.java file because it is not synched with all the dependencies (if so, just add the needed variable to it)</li>
-<li>The head does not compile in the svn -- if you believe that is the case, send an e-mail to the pydev-code list at sourceforge to know what's happening.</li>
+<li>The head does not compile in git -- if you believe that is the case, send an e-mail to the pydev-code list at sourceforge to know what's happening.</li>
 </ul>
 </blockquote>
 </div>
@@ -78,47 +87,7 @@ <h1><a class="toc-backref" href="#id5">Creating a distribution locally</a></h1>
         ... (other plugins)
 </pre>
 </blockquote>
-<p>Now, on to the build: start a shell and make sure ant is in your <strong>PATH</strong> and the <strong>JAVA_HOME</strong>
-is properly set.</p>
-<p>In windows (update paths accordingly):</p>
-<p><strong>set PATH=%PATH%;W:\eclipse_350_clean\plugins\org.apache.ant_1.7.0.v200803061910\bin</strong></p>
-<p><strong>set JAVA_HOME=D:\bin\jdk_1_5_09</strong></p>
-<p>For the other instructions, we'll supose that pydev was downloaded to c:/pydev and the structure we have is:</p>
-<blockquote>
-<p>c:/pydev/builders</p>
-<p>c:/pydev/features</p>
-<p>c:/pydev/plugins</p>
-</blockquote>
-<p>Go to the folder:</p>
-<blockquote>
-c:/pydev/builders/org.python.pydev.build</blockquote>
-<p>And type the following command (customizing the variables as explained below)</p>
-<p><strong>ant -DbuildDirectory=c:/pydev -Dbaseos=win32 -Dbasews=win32 -Dbasearch=x86 -Ddeploy.dir=c:/pydev/pydev_deploy -DcleanAfter=false -Dvanilla.eclipse=W:/eclipse_350_clean</strong></p>
-<blockquote>
-<p><strong>-DbuildDirectory=c:/pydev</strong></p>
-<blockquote>
-The folder that has /builders, /features and /plugins</blockquote>
-<p><strong>-Dbaseos=win32</strong></p>
-<blockquote>
-The platform (e.g.: linux, macosx, solaris, etc)</blockquote>
-<p><strong>-Dbasews=win32</strong></p>
-<blockquote>
-The windows system (e.g.: gtk, motif, carbon)</blockquote>
-<p><strong>-Dbasearch=x86</strong></p>
-<blockquote>
-The architechure (e.g.: ppc, sparc)</blockquote>
-<p><strong>-Ddeploy.dir=c:/pydev/pydev_deploy</strong></p>
-<blockquote>
-Directory where the update site and zips will be added.</blockquote>
-<p><strong>-DcleanAfter=false</strong></p>
-<blockquote>
-Whether it should clean things up after doing the build (reverts the sources to the svn version and deletes eclipse)</blockquote>
-<p><strong>-Dvanilla.eclipse=W:/eclipse_350_clean</strong></p>
-<blockquote>
-A location of a clean eclipse folder to be copied to do the build</blockquote>
-</blockquote>
-<p>And that's it, if everything went OK, you should have created an update site at the deploy dir specified (and the zip distribution
-should be there too).</p>
+<p>Now, on to the build: start a shell and follow the instructions at /plugins/org.python.pydev.build/build_cmd.txt (read the end of the file for details on customizing it properly)</p>
 </div>
 <div class="section" id="contributing-back">
 <h1><a class="toc-backref" href="#id6">Contributing back</a></h1>

diff --git a/plugins/com.python.pydev.docs/merged_homepage/developers.rst b/plugins/com.python.pydev.docs/merged_homepage/developers.rst
@@ -21,17 +21,26 @@ Repository
 
 .. _https://github.com/aptana/Pydev: https://github.com/aptana/Pydev
 
-Get the code with Git from https://github.com/aptana/Pydev (or you may browse it to get a zip with the contents)
+Get the code with Git from https://github.com/aptana/Pydev (ideally, fork it at github, create your own branch at the 
+forked repository -- usually based in the development branch -- and later send a pull request on github so that 
+the code can be merged back). Later, if you want to provide some other feature/bugfix, a new branch should be created again.
 
-And later go to: **File > Import > Existing projects into workspace** and point it to the root of the repository you just downloaded.
+Then, in Eclipse, go to: **File > Import > Existing projects into workspace** and point it to the root of the repository you just downloaded.
+
+Note that currently Pydev has a project (org.python.pydev.red_core) which has a dependency on Aptana Studio 3, so, if 
+you plan on doing a local build, you'll need to get Aptana Studio 3 installed as a plugin in the SDK used for the build 
+(i.e.: not necessarily in the SDK you use for developing), now if you don't need to do a local build 
+(i.e.: just do your local changes and run Eclipse with your changes from within the SDK and contribute that 
+as a patch later on), you can just close this project so that it doesn't get compiled.
 
 
 Configuring the environment after getting the code
 ---------------------------------------------------
 
+Important: Before doing any changes to the code it's important to note that you should create a new branch for doing code changes.
+See: http://book.git-scm.com/3_basic_branching_and_merging.html and also http://nvie.com/git-model for details on creating and using branches.
 
-
-After you do that, you'll probably note that the tests did **not compile successfully**. This is because there are some settings
+After getting the code, you'll probably note that the tests did **not compile successfully**. This is because there are some settings
 that will depend on your installation, and this settings are stored in a class that holds that info (which you'll have to create).
 
 There is a 'template' for that file at: 
@@ -41,9 +50,8 @@ There is a 'template' for that file at:
 not compile, it may mean that: 
 
  * There is something missing in that TestDependent.java file because it is not synched with all the dependencies (if so, just add the needed variable to it)
- * The head does not compile in the svn -- if you believe that is the case, send an e-mail to the pydev-code list at sourceforge to know what's happening.
-
-
+ * The head does not compile in git -- if you believe that is the case, send an e-mail to the pydev-code list at sourceforge to know what's happening.
+
 
 .. _`jython scripting in pydev`: manual_articles_scripting.html
 .. _`Pydev Grammar`: developers_grammar.html
@@ -92,66 +100,7 @@ Provided that the steps were followed, Pydev should have the following structure
 	        ... (other plugins)
 
 
-Now, on to the build: start a shell and make sure ant is in your **PATH** and the **JAVA_HOME** 
-is properly set.
-
-In windows (update paths accordingly): 
-
-
-**set PATH=%PATH%;W:\\eclipse_350_clean\\plugins\\org.apache.ant_1.7.0.v200803061910\\bin**
-
-**set JAVA_HOME=D:\\bin\\jdk_1_5_09**
-
-
-For the other instructions, we'll supose that pydev was downloaded to c:/pydev and the structure we have is:
-
-	c:/pydev/builders
-
-	c:/pydev/features
-
-	c:/pydev/plugins
-
-Go to the folder:
-
-	c:/pydev/builders/org.python.pydev.build
-
-And type the following command (customizing the variables as explained below)
-
-**ant -DbuildDirectory=c:/pydev -Dbaseos=win32 -Dbasews=win32 -Dbasearch=x86 -Ddeploy.dir=c:/pydev/pydev_deploy -DcleanAfter=false -Dvanilla.eclipse=W:/eclipse_350_clean**
-
-
-	**-DbuildDirectory=c:/pydev**       
-
-		The folder that has /builders, /features and /plugins
-
-	**-Dbaseos=win32**        
-
-		The platform (e.g.: linux, macosx, solaris, etc) 
-
-	**-Dbasews=win32**        
-
-		The windows system (e.g.: gtk, motif, carbon)
-
-	**-Dbasearch=x86**        
-
-		The architechure (e.g.: ppc, sparc)
-
-	**-Ddeploy.dir=c:/pydev/pydev_deploy**        
-
-		Directory where the update site and zips will be added.
-
-	**-DcleanAfter=false**        
-
-		Whether it should clean things up after doing the build (reverts the sources to the svn version and deletes eclipse)
-
-	**-Dvanilla.eclipse=W:/eclipse_350_clean**      
-
-		A location of a clean eclipse folder to be copied to do the build
-
-And that's it, if everything went OK, you should have created an update site at the deploy dir specified (and the zip distribution
-should be there too).
-
-
+Now, on to the build: start a shell and follow the instructions at /plugins/org.python.pydev.build/build_cmd.txt (read the end of the file for details on customizing it properly)
 
 
 

diff --git a/plugins/com.python.pydev.docs/merged_homepage/index.contents.html b/plugins/com.python.pydev.docs/merged_homepage/index.contents.html
@@ -26,6 +26,50 @@ <h1>What is Pydev?</h1>
 </blockquote>
 <p>For more details on the provided features, check the <a class="reference external" href="manual_adv_features.html">Features Matrix</a>.</p>
 </div>
+<div class="section" id="release-1-6-5">
+<h1>Release 1.6.5</h1>
+<blockquote>
+<ul>
+<li><p class="first">Syntax hightlighting now has options to have {}, [] and () as well as operators in different colors</p>
+</li>
+<li><p class="first">Code generation for classes and methods:</p>
+<blockquote>
+<p>Note that this is an initial implementation of the idea, aimed as those that use a TDD (Test Driven Development) approach,
+so, one can create the test first and generate the classes/methods later on from using shortcuts or quick-fixes (which is
+something that those using JDT -- Java Development Tools -- in Eclipse should be already familiar with). This feature
+should be already usable on a number of situations but it's still far from being 100% complete.</p>
+<ul class="simple">
+<li>Alt+Shift+S C can be used to create a class for the currently selected token</li>
+<li>Alt+Shift+S M can be used to create a method for the currently selected token</li>
+<li>Ctrl+1 has as a quick fix for creating a class or method</li>
+</ul>
+</blockquote>
+</li>
+<li><dl class="first docutils">
+<dt>Debugger</dt>
+<dd><ul class="first last simple">
+<li>When discovering encoding on Python 3.x, the file is opened as binary</li>
+<li>Remote debugger (pydevd.settrace) properly synchronized</li>
+<li>Fixed debugger issue on interpreter shutdown on Python 2.7</li>
+</ul>
+</dd>
+</dl>
+</li>
+<li><dl class="first docutils">
+<dt>Bug fixes:</dt>
+<dd><ul class="first last simple">
+<li>Fixed issue when doing code-completion on a line that started with some token that started with 'import'. e.g.: import_foo = a</li>
+<li>Fixed import when running unittest with coverage</li>
+<li>Fixed extract local (could extract to wrong location)</li>
+<li>Fixed NPE when requesting print of arguments in the context-information tooltips</li>
+<li>Fixed AttributeError with pydevconsole on Python 3.x</li>
+</ul>
+</dd>
+</dl>
+</li>
+</ul>
+</blockquote>
+</div>
 <div class="section" id="release-1-6-4">
 <h1>Release 1.6.4</h1>
 <blockquote>

diff --git a/plugins/com.python.pydev.docs/merged_homepage/index.rst b/plugins/com.python.pydev.docs/merged_homepage/index.rst
@@ -42,6 +42,36 @@ It comes with many goodies such as:
 
 For more details on the provided features, check the `Features Matrix`_.
 
+
+Release 1.6.5
+==============
+
+ * Syntax highlighting now has options to have {}, [] and () as well as operators in different colors
+
+ * Code generation for classes and methods:
+
+     Note that this is an initial implementation of the idea, aimed as those that use a TDD (Test Driven Development) approach,
+     so, one can create the test first and generate the classes/methods later on from using shortcuts or quick-fixes (which is 
+     something that those using JDT -- Java Development Tools -- in Eclipse should be already familiar with). This feature 
+     should be already usable on a number of situations but it's still far from being 100% complete.
+
+     * Alt+Shift+S C can be used to create a class for the currently selected token
+     * Alt+Shift+S M can be used to create a method for the currently selected token
+     * Ctrl+1 has as a quick fix for creating a class or method
+
+ * Debugger
+     * When discovering encoding on Python 3.x, the file is opened as binary
+     * Remote debugger (pydevd.settrace()) properly synchronized
+     * Fixed debugger issue on interpreter shutdown on Python 2.7
+
+ * Bug fixes:    
+     * Fixed issue when doing code-completion on a line that started with some token that started with 'import'. e.g.: import_foo = a
+     * Fixed import when running unittest with coverage
+     * Fixed extract local (could extract to wrong location)    
+     * Fixed NPE when requesting print of arguments in the context-information tooltips
+     * Fixed AttributeError with pydevconsole on Python 3.x
+
+
 Release 1.6.4
 ==============
 

diff --git a/plugins/com.python.pydev.docs/merged_homepage/manual_101_first_module.contents.html b/plugins/com.python.pydev.docs/merged_homepage/manual_101_first_module.contents.html
@@ -7,30 +7,30 @@
 just in case, you can open it by going to the menu: window &gt; open perspective &gt; other &gt; pydev, as pointed in the picture below.</p>
 <p><strong>IMPORTANT:</strong> if you had an earlier version of pydev installed, you must close the perspective and open it again, as older
 versions of it may not have everything needed for this example (to do that, make the perspective active, then go to the menu: window &gt; close perspective)</p>
-<div align="center" class="align-center"><img alt="images/open_perspective.png" class="snap align-center" src="images/open_perspective.png" /></div>
+<img alt="images/open_perspective.png" class="snap align-center" src="images/open_perspective.png" />
 <p>A perspective 'defines' what appears in your window and which actions are enabled... If you want to add something (even some menu), you can
 go to the menu: window &gt; customize perspective. To create our first module, we will use the default pydev perspective, as it already has the wizard shortcuts
 pre-defined in the <strong>File &gt; new</strong> menu</p>
 <p>First, we will start creating a new package in a project named 'test' (it was created with the default 'src' folder, and all the code should be put
 underneath it).</p>
 <p>So, let the 'src' folder selected and go to the menu: <strong>File &gt; new &gt; pydev package</strong> and fill the package name as below (the source folder should
 be automatically filled)..</p>
-<div align="center" class="align-center"><img alt="images/new_package.png" class="snap align-center" src="images/new_package.png" /></div>
+<img alt="images/new_package.png" class="snap align-center" src="images/new_package.png" />
 <p>If everything goes ok, the structure below will be created (and the file /root/nested/__init__.py will be opened).</p>
 <p><strong>Note:</strong> Check to see if the 'P' icon is appearing for your items (as in the picture below) and in the top of your editor
 after opening it. If it's not appearing, it may be that there's a problem with the file association, so, go to window &gt; preferences &gt;
 general &gt; editors &gt; file associations and make sure that the .py files are associated with the Python Editor (note that
 because of an eclipse bug, if it seems correct, you may have to remove the association and add it again)</p>
-<div align="center" class="align-center"><img alt="images/structure1.png" class="snap align-center" src="images/structure1.png" /></div>
+<img alt="images/structure1.png" class="snap align-center" src="images/structure1.png" />
 <p>Now, let's create the 'example' module. Let the folder /root/nested selected and go to the menu: <strong>File &gt; new &gt; pydev module</strong> and fill the
 module name as below (again, the other fields should be automatically filled).</p>
 <p>In this screen you may also select which should be the template used to create the new module (and the <strong>Config...</strong> link
 in the dialog can take you to the place where you can add/remove/edit those -- which are the templates under the <strong>New Module</strong>
 context.</p>
-<div align="center" class="align-center"><img alt="images/new_module.png" class="snap align-center" src="images/new_module.png" /></div>
+<img alt="images/new_module.png" class="snap align-center" src="images/new_module.png" />
 <p>The file '/root/nested/example.py' should have been created, so, to finish this example, in the empty file, press Ctrl+Space (that's the
 shortcut for the pydev code-completion). Once you do that, the 'context-sensitive' completions should appear (as below).</p>
-<div align="center" class="align-center"><img alt="images/codecompl1.png" class="snap align-center" src="images/codecompl1.png" /></div>
+<img alt="images/codecompl1.png" class="snap align-center" src="images/codecompl1.png" />
 <p><strong>NOTE:</strong> If the code-completion does not work, you should check:</p>
 <blockquote>
 <ul class="simple">

diff --git a/plugins/com.python.pydev.docs/merged_homepage/manual_101_install.contents.html b/plugins/com.python.pydev.docs/merged_homepage/manual_101_install.contents.html
@@ -6,32 +6,42 @@
 <p class="topic-title first">Contents</p>
 <ul class="simple">
 <li><a class="reference internal" href="#note-for-users-with-aptana-studio-3-beta" id="id2">Note for users with Aptana Studio 3 (Beta)</a></li>
-<li><a class="reference internal" href="#installing-with-the-update-site" id="id3">Installing with the update site</a><ul>
-<li><a class="reference internal" href="#id1" id="id4">Available update sites</a></li>
-<li><a class="reference internal" href="#commom-install-problems" id="id5">Commom install problems</a></li>
+<li><a class="reference internal" href="#before-starting-the-install" id="id3">Before starting the install</a></li>
+<li><a class="reference internal" href="#installing-with-the-update-site" id="id4">Installing with the update site</a><ul>
+<li><a class="reference internal" href="#id1" id="id5">Available update sites</a></li>
+<li><a class="reference internal" href="#commom-install-problems" id="id6">Commom install problems</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#installing-with-the-zip-file" id="id6">Installing with the zip file</a></li>
-<li><a class="reference internal" href="#checking-the-installation" id="id7">Checking the installation</a></li>
-<li><a class="reference internal" href="#uninstalling" id="id8">Uninstalling</a></li>
-<li><a class="reference internal" href="#corrupted-install" id="id9">Corrupted install</a></li>
+<li><a class="reference internal" href="#installing-with-the-zip-file" id="id7">Installing with the zip file</a></li>
+<li><a class="reference internal" href="#checking-the-installation" id="id8">Checking the installation</a></li>
+<li><a class="reference internal" href="#uninstalling" id="id9">Uninstalling</a></li>
+<li><a class="reference internal" href="#corrupted-install" id="id10">Corrupted install</a></li>
 </ul>
 </div>
 <div class="section" id="note-for-users-with-aptana-studio-3-beta">
 <h1><a class="toc-backref" href="#id2">Note for users with Aptana Studio 3 (Beta)</a></h1>
 <p>Pydev already comes preinstalled in <a class="reference external" href="http://aptana.com/products/studio3">Aptana Studio 3</a>, so, this step can be skipped (note that if <a class="reference external" href="http://aptana.com/products/studio3">Aptana Studio 3</a> is used,
 Pydev cannot be installed or update separately, as it must always be updated as a whole).</p>
 </div>
+<div class="section" id="before-starting-the-install">
+<h1><a class="toc-backref" href="#id3">Before starting the install</a></h1>
+<p>The first thing to choose before the install is a folder where you have permissions to write (otherwise,
+remember to install Eclipse running as an Administrator and remember to run as an Administrator whenever
+any plugin needs to be updated).</p>
+<p>Also, it seems Eclipse 3.6.0 has some issues installing in shared locations (in any OS). An example of such a location would
+be the Program Files directory on Windows (see: <a class="reference external" href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=322929">https://bugs.eclipse.org/bugs/show_bug.cgi?id=322929</a>), so,
+please use at least 3.6.1 if planning to install Eclipse/Pydev on a shared location.</p>
+</div>
 <div class="section" id="installing-with-the-update-site">
-<h1><a class="toc-backref" href="#id3">Installing with the update site</a></h1>
+<h1><a class="toc-backref" href="#id4">Installing with the update site</a></h1>
 <p><strong>Note: Instructions are targeted at Eclipse 3.5 and 3.6</strong></p>
 <p>To install Pydev and Pydev Extensions using the Eclipse Update Manager, you need to use the <strong>Help &gt; Install New Software...</strong>
 menu (note that in older versions, this would be the 'Find and Install' menu).</p>
-<div align="center" class="align-center"><img alt="images/install_menu.png" class="snap align-center" src="images/install_menu.png" /></div>
+<img alt="images/install_menu.png" class="snap align-center" src="images/install_menu.png" />
 <p>In the next screen, add the update site(s) you want to work with (<strong>See below for a list with the</strong> <a class="reference internal" href="#available-update-sites">available update sites</a>).</p>
-<div align="center" class="align-center"><img alt="images/update_sites.png" class="snap align-center" src="images/update_sites.png" /></div>
+<img alt="images/update_sites.png" class="snap align-center" src="images/update_sites.png" />
 <div class="section" id="id1">
-<h2><a class="toc-backref" href="#id4"><span class="target" id="available-update-sites">Available update sites</span></a></h2>
+<h2><a class="toc-backref" href="#id5"><span class="target" id="available-update-sites">Available update sites</span></a></h2>
 <table class="docutils field-list" frame="void" rules="none">
 <col class="field-name" />
 <col class="field-body" />
@@ -51,16 +61,16 @@ <h2><a class="toc-backref" href="#id4"><span class="target" id="available-update
 <p>After entering the update sites, select the update site you entered or
 select &quot;All available sites&quot; and add a filter for Pydev, so that it
 shows the contents of all the update sites that have Pydev, then select what you want to install and click 'Next'.</p>
-<div align="center" class="align-center"><img alt="images/update_sites2.png" class="snap align-center" src="images/update_sites2.png" /></div>
+<img alt="images/update_sites2.png" class="snap align-center" src="images/update_sites2.png" />
 <p>Then 'Next' again to confirm your selection</p>
-<div align="center" class="align-center"><img alt="images/update_sites3.png" class="snap align-center" src="images/update_sites3.png" /></div>
+<img alt="images/update_sites3.png" class="snap align-center" src="images/update_sites3.png" />
 <p>And finally, read the license agreement and if you accept, select the accept radio button and click 'Finish'.</p>
-<div align="center" class="align-center"><img alt="images/update_sites4.png" class="snap align-center" src="images/update_sites4.png" /></div>
+<img alt="images/update_sites4.png" class="snap align-center" src="images/update_sites4.png" />
 <p>At that point, Eclipse should automatically download the plugin contents and present you to a dialog asking
 if you want to restart (to which you should say <strong>yes</strong>).</p>
 </div>
 <div class="section" id="commom-install-problems">
-<h2><a class="toc-backref" href="#id5">Commom install problems</a></h2>
+<h2><a class="toc-backref" href="#id6">Commom install problems</a></h2>
 <p>If you have any problem at this point with a message such as:</p>
 <blockquote>
 <pre class="literal-block">
@@ -76,7 +86,7 @@ <h2><a class="toc-backref" href="#id5">Commom install problems</a></h2>
 </div>
 </div>
 <div class="section" id="installing-with-the-zip-file">
-<h1><a class="toc-backref" href="#id6">Installing with the zip file</a></h1>
+<h1><a class="toc-backref" href="#id7">Installing with the zip file</a></h1>
 <p>The available locations for the zip files are:</p>
 <ul class="simple">
 <li><a class="reference external" href="http://sourceforge.net/projects/pydev/files/">SourceForge download</a></li>
@@ -90,12 +100,12 @@ <h1><a class="toc-backref" href="#id6">Installing with the zip file</a></h1>
 After that, restart Eclipse with the '-clean' flag, so that Eclipse finds out about it.</p>
 </div>
 <div class="section" id="checking-the-installation">
-<h1><a class="toc-backref" href="#id7">Checking the installation</a></h1>
+<h1><a class="toc-backref" href="#id8">Checking the installation</a></h1>
 <p>You can verify if it is correctly installed going to the menu <strong>'window &gt; preferences'</strong> and
 checking if there is a <strong>Pydev</strong> item under that.</p>
 </div>
 <div class="section" id="uninstalling">
-<h1><a class="toc-backref" href="#id8">Uninstalling</a></h1>
+<h1><a class="toc-backref" href="#id9">Uninstalling</a></h1>
 <p>Follow the instructons below if at any time you wish to stop using the Pydev plugin
 (or any other Eclipse plugin):</p>
 <p><strong>Eclipse 3.5</strong></p>
@@ -108,7 +118,7 @@ <h1><a class="toc-backref" href="#id8">Uninstalling</a></h1>
 go to the same place again and then click on 'remove' (note that you have a button in the menu that enables you to see the 'disabled' features).</p>
 </div>
 <div class="section" id="corrupted-install">
-<h1><a class="toc-backref" href="#id9">Corrupted install</a></h1>
+<h1><a class="toc-backref" href="#id10">Corrupted install</a></h1>
 <blockquote>
 <p>Eclipse sometimes is not able to correctly get the plugin, from the update site but will do no checking
 on whether it is really correct (no md5 checking), and when this happens, you'll usually get a ClassNotFoundException

diff --git a/plugins/com.python.pydev.docs/merged_homepage/manual_101_install.rst b/plugins/com.python.pydev.docs/merged_homepage/manual_101_install.rst
@@ -10,6 +10,16 @@ Pydev already comes preinstalled in `Aptana Studio 3`_, so, this step can be ski
 Pydev cannot be installed or update separately, as it must always be updated as a whole). 
 
 
+Before starting the install
+============================
+
+The first thing to choose before the install is a folder where you have permissions to write (otherwise, 
+remember to install Eclipse running as an Administrator and remember to run as an Administrator whenever 
+any plugin needs to be updated).
+
+Also, it seems Eclipse 3.6.0 has some issues installing in shared locations (in any OS). An example of such a location would 
+be the Program Files directory on Windows (see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=322929), so, 
+please use at least 3.6.1 if planning to install Eclipse/Pydev on a shared location.
 
 
 Installing with the update site