TISTUD-3271 - adding a UID along with the cookie when sending an analytics event
TISTUD-3271 - Pass the user GUID instead of UID
Merge branch 'release'

Conflicts:
	plugins/com.aptana.usage/src/com/aptana/usage/StudioAnalytics.java
Fixed the build.
TISTUD-3869 Adopt Standard UX for Profiler Launch
Fixed the build again.
TISTUD-3860 Fixing an edge case with clearing the preference
TISTUD-3869 Missing unstated changes
Fixed merge conflict.
Fix TISTUD-4074 - Use toString() instead of toOSString() when creating the mapped URI for the source file location
Fix TISTUD-4101 Titanium Updates: Failed to install acs. if PYTHON not in system path
      - Super hack to append to PATH location of python from com.appcelerator.titanium.python.win32 plugin when we're on windows, can't find a python.exe on PATH, and we have the plugin installed.
Fixed TISTUD-4203: handle backspace character in the console.
TISTUD-4203 Skip backspace characters
Fixed TISTUD-4203 TISTUD-4256 TISTUD-4258 TISTUD-4259: the previous fix for skipping backspace characters was causing the log to not show until the console is terminated. Applying a re-fix.
Updated to the ruby executable path.
Updated the ruby executable to the right path.
Merge branch 'release'

Conflicts:
	plugins/com.aptana.js.core/src/com/aptana/js/internal/core/node/NodePackageManager.java
TISTUD-4721 Call "npm cache clean" when installing/updating npm packages in Studio
Fixed TISTUD-4757: sample import wizard got cutoff for the cloud section.
Fixed TISTUD-4775: code processor could not show result on Linux.