Fixed TISTUD-5924: NPE when opening TiApp during startup.
Merge branch 'development' of github.com:aptana/studio3 into development

Conflicts:
	plugins/com.aptana.theme/src/com/aptana/theme/ThemePlugin.java