metadata
Merge remote-tracking branch 'origin/master'

Conflicts:
	.metadata/.log
	.metadata/.mylyn/repositories.xml.zip
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.egit.core.prefs
	.metadata/.plugins/org.eclipse.equinox.p2.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.mylyn.github.ui/avatars.ser
	.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml