update
Merge branch 'master' of github.com:ismdeep/DevStudio

Conflicts:
	xmind-portable-3.3.1.201212250029/Commons/data/workspace-cathy/.metadata/.log
	xmind-portable-3.3.1.201212250029/Commons/data/workspace-cathy/.metadata/.plugins/net.xmind.verify/.poem
	xmind-portable-3.3.1.201212250029/Commons/data/workspace-cathy/.metadata/.plugins/net.xmind.workbench/dialog_settings.xml
	xmind-portable-3.3.1.201212250029/Commons/data/workspace-cathy/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
	xmind-portable-3.3.1.201212250029/Commons/data/workspace-cathy/.metadata/.plugins/org.xmind.ui.mindmap/dialog_settings.xml
	xmind-portable-3.3.1.201212250029/Commons/data/workspace-cathy/workbookhistory.properties
	xmind-portable-3.3.1.201212250029/Commons/plugins/com.lowagie.itext_2.1.3/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.hebe.nl_da_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.hebe.nl_de_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.hebe.nl_es_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.hebe.nl_fr_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.hebe.nl_ja_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.hebe.nl_ko_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.hebe.nl_ru_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.hebe.nl_sl_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.hebe.nl_zh_CN_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.hebe.nl_zh_TW_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.lame.macosx_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.lame.win32_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.ui.gallery.resources_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.ui.help.nl_da_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.ui.help.nl_de_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.ui.help.nl_es_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.ui.help.nl_fr_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.ui.help.nl_ja_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.ui.help.nl_ko_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.ui.help.nl_ru_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.ui.help.nl_sl_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.ui.help.nl_zh_CN_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.ui.help.nl_zh_TW_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.ui.help_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.ui.nl_da_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.ui.nl_es_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.ui.nl_fr_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.ui.nl_ja_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.ui.nl_ko_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.ui.nl_ru_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.ui.nl_sl_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.ui.nl_zh_CN_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.ui.nl_zh_TW_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.ui.resources_3.3.1.201212250029/META-INF/MANIFEST.MF
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.ui.resources_3.3.1.201212250029/styles/defaultStyles.xml
	xmind-portable-3.3.1.201212250029/Commons/plugins/org.xmind.ui.resources_3.3.1.201212250029/styles/themes.xml
	xmind-portable-3.3.1.201212250029/XMind_Linux/configuration/org.eclipse.core.runtime/.manager/.fileTable.8
	xmind-portable-3.3.1.201212250029/XMind_Windows/configuration/org.eclipse.core.runtime/.manager/.fileTable.9
	xmind-portable-3.3.1.201212250029/XMind_Windows/configuration/org.eclipse.osgi/.manager/.fileTable.6
	xmind-portable-3.3.1.201212250029/XMind_Windows/configuration/org.eclipse.osgi/.manager/.fileTable.7