Moved copy-and-paste declaration for handling resources out into its own action provider (to fix APSTUD-4410).
Merge branch 'release' of github.com:/aptana/studio3 into release
Move branch to 3.1.2.
Update version to 3.1.1
Finally fixed APSTUD-4410: needed to override python's action provider as it also overrides Eclipse' edit actions.
Fixed TISTUD-1482: NPE in the log when Studio is shut down.
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
APSTUD-4363 Implement HTML hovers for elements
  - Address Kevin's review feedback - provide more specific error messages for type mismatches on key/value
  - Extract common hover utility class to editor.common
  - Externalize UI Strings
  - Add unit tests for new map methods with defined types
  - Add newMap/addToMap methods with defined key/value types
  - Use CollectionsUtil.newMap
  - Fix compile issue in Eclipse 4.2
  - Bump index version
  - don't resolve entities in examples
  - Include "remarks" when deserializing from JSON
  - Fix some busted HTML metadata
  - Update common hover extension
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.
Fixed APSTUD-4599: widget disposed too early.
Defined a class for the go-to-matching-bracket handler to remove the message in the log.