Eclipse trash
Merge remote-tracking branch 'origin/master'

Conflicts:
	.metadata/.log

	.metadata/.plugins/org.eclipse.core.resources/.projects/AM_NETWORKS_TDSU/org.eclipse.jdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.projects/AM_NETWORKS_TDSU/org.eclipse.wst.jsdt.core/state.dat

	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.wst.jsdt.core/externalLibsTimeStamps

	.metadata/.plugins/org.eclipse.wst.jsdt.core/indexes/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.wst.jsdt.core/variablesAndContainers.dat