automatic eclipse changes
more automatic eclipse changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/AssignmentTracker/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/AssignmentTracker/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/AssignmentTracker/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.jdt.core/2857143765.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png
	appcompat_v7/bin/appcompat_v7.jar