- TISTUD-5151 Errors occurred while refreshing git index ( importing KitchenSink from Samples)
- TISTUD-5176 NPE error occured when imported samples from Studio without setting git repository
  - Try to avoid NPE when accessing potentially null branches field.
  - When disposing a repo make sure to stop all jobs related to the repo (coming from file watcher hooks)
TISTUD-5166 Appcelerator Studio: stuck on the splash screen when restart
Merge branch 'master' of https://github.com/aptana/studio3
Fixing a minor condition with sending analytics
TISTUD-5168 Proxy settings not used when downloading APM module from AWS S3 bucket
Fix TISTUD-5221: handle branch removal error appeared while importing the sample.
TISTUD-5220 Ubuntu: Appcelerator Studio freezes on launching project on android emulator
TISTUD-4335 published url on windows and Java 7
Fixing the Java7 condition
Merge branch 'release'
TISTUD-4335: correct the isJava7 expression.
TISTUD-4335: correct the isJava7 expression.
Fixed TISTUD-5151: do not throw the error while refreshing git index.
Fixed TISTUD-5151: do not throw the error while refreshing git index.
TISTUD-5431 Node Package Installer: application npm install location is incorrect
Merge branch 'release'
TISTUD-4490 Download Eclipse 4.3 M7, set as local build target and fix any compilation errors in plugins
  - Fix to get ticket attachments working for JIRA
  - Update to use httpclient 4.x API
  - Add httpclient 4.1.3 plugin
TISTUD-4490 Download Eclipse 4.3 M7, set as local build target and fix any compilation errors in plugins
  - Rename httpcore JAR to see if it fixes build
TISTUD-4490 Download Eclipse 4.3 M7, set as local build target and fix any compilation errors in plugins
  - Try to fix build against 4.3M7 on build machine?

Conflicts:
	features/com.aptana.feature/feature.xml
TISTUD-4490 Download Eclipse 4.3 M7, set as local build target and fix any compilation errors in plugins
  - Another try at fixing the build on the build machine. Instead of just listing org.apache.httpcomponents/httpcore as our dependency, actually list packages we need to import since the Eclipse version of the lib is missing a number of those packages.