dummy
Merge branch 'master' of https://github.com/akaghzi/java

Conflicts:
	.metadata/.log
	.metadata/.mylyn/tasks.xml.zip

.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.
index
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide
.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/assumedExternalFilesCache
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml

.metadata/.plugins/org.eclipse.m2e.core/nexus/26522e0d83a422eed93329ece7
565cfc/segments.gen

.metadata/.plugins/org.eclipse.m2e.core/nexus/830bc118332e77292949ed1e6d
2fabe0/segments.gen
	.metadata/.plugins/org.eclipse.m2e.core/workspaceState.ser
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/.plugins/org.jboss.tools.central/jboss_buzz.xml
	.metadata/.plugins/org.jboss.tools.central/valid_jboss_buzz.xml
	.metadata/version.ini