Update version to 3.1.1
APSTUD-4061 supporting change - Expose the folding-computer getPositions to the subclasses and allow cancelling the monitor when needed to avoid folding update.
APSTUD-4543
  - Create "lazy" build participants that don't instantiate the actual classes unless they're actually being used - instead we just consult the IConfigurationElement for name, priority, enablement, content types
  = Add projectNatureBindings to build participants. We now check the list of project natures as a first pass at determining if a build participant should be instantiated and run. (if it applies, we do a second pass at looking at enablement, which loads the prefs for the contributing plugin; and if we're building files we do a third pass based on contentTypeBindings for the given file.)
Fixed TISTUD-1323: implemented a workaround to not auto-expand JS outline to 2 levels by default.

Conflicts:

	plugins/com.aptana.editor.common/src/com/aptana/editor/common/AbstractThemeableEditor.java
Fixed APSTUD-3422: speed up the diff comparison for showing differences in smart sync dialog.
Fixed TISTUD-1134: correctly indent HTML template when created from File > New From Template > HTML > HTML 5.
Fixed APSTUD-4475: do not auto-expand outline for CSS file when opened.

Conflicts:

	plugins/com.aptana.editor.common/src/com/aptana/editor/common/AbstractThemeableEditor.java
Implement APSTUD-4408 Lazily load "additional info" for Javascript content assist
Fix for APSTUD-4549.
- Cancel all index jobs when shutting down the index plugin.
- Place all index request jobs into the same family.
- Check for possible null plugin when grabbing the index manager from a
  IndexRequestJob. Update all methods that can now get null values from
  that as well.
- Check for possible null index from IndexRequestJob during shutdown
Fix busted unit test expectations
Moved copy-and-paste declaration for handling resources out into its own action provider (to fix APSTUD-4410).

Conflicts:

	plugins/com.aptana.ui.io/plugin.xml
Finally fixed APSTUD-4410: needed to override python's action provider as it also overrides Eclipse' edit actions.
Fix broken behavior for determining if a build participant wrapped in a lazy build participant is enabled for a given build type. We need to instantiate the participant and ask, since it may be hard-coded for required participants. This makes us "less lazy", but realistically we end up activating the contributing plugin to look up enablement in the prefs anyways (for non-required participants)
Fixed what Rick originally reported in TISTUD-336.
Fixed TISTUD-336: fixed the case when the invocation is wrapped inside the self-invoking function.
Fixed TISTUD-1490: now checks for write permissions during the unzipping process as well.
Added logging for TISTUD-1382.
Fixed TISTUD-1382: added element visiblity listener to ensure the samples are reloaded at the right time.
Fix for APSTUD-4656 to no longer set the default encoding for file types.
Merge remote branch 'origin/master' into release

Conflicts:
	features/com.aptana.feature/feature.xml
	plugins/com.aptana.branding/META-INF/MANIFEST.MF
	plugins/com.aptana.editor.common/src/com/aptana/editor/common/AbstractThemeableEditor.java