khe
Merge remote-tracking branch 'origin/master'

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/Java/.indexes/e4/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Java/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/Java/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/Java/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/1.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	.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/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml