sa
Merge https://github.com/amitmallmailbox/eclipseOffice

Conflicts:
	.metadata/.log
	.metadata/.mylyn/.taskListIndex/segments_1
	.metadata/.mylyn/.tasks.xml.zip
	.metadata/.mylyn/repositories.xml.zip
	.metadata/.mylyn/tasks.xml.zip
	.metadata/.plugins/net.fornwall.eclipsecoder/problemStats.ser
	.metadata/.plugins/org.eclipse.core.resources/.projects/Test/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.mpc.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.core.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.jsdt.ui.prefs
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.equinox.p2.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.jdt.core/1657330681.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ltk.ui.refactoring/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	.metadata/.plugins/org.eclipse.wst.sse.core/task-tags.properties
asd