metaddata commit
Merge branch 'master' of https://github.com/nekozombie/nekoz

Conflicts:
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/junit-tutorial/.markers.snap
	workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/junit-tutorial/.syncinfo.snap
	workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	workspace/.metadata/.plugins/org.eclipse.core.resources/.snap
	workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	workspace/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	workspace/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	workspace/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat