TISTUD-2439 - Fix try for a potential launch failure due to a NPE.
Fix related to TISTUD-2621 About box shows "%product.name" instead of correct text for non-English versions of Studio
Fix related to TISTUD-2621 About box shows "%product.name" instead of correct text for non-English versions of Studio
Updated master branch to 3.3.1.
Merge branch 'release'

Conflicts:
	builders/com.aptana.rcp.build/build_local.properties
	builders/com.aptana.win.installer/windows-nsis/Aptana Studio.nsi
	features/com.aptana.feature.rcp/feature.xml
	features/com.aptana.feature.studio/feature.xml
	plugins/com.aptana.rcp/META-INF/MANIFEST.MF