Update
Update
update
Update
Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	.metadata/.log
	.metadata/.mylyn/.tasks.xml.zip
	.metadata/.mylyn/tasks.xml.zip
	.metadata/.plugins/org.eclipse.cdt.core/.log

	.metadata/.plugins/org.eclipse.core.resources/.projects/GuilfordProject/.indexes/properties.index

	.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/org.eclipse.egit.core/GitProjectData.properties

	.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/.safetable/org.eclipse.core.resources

	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.adt.prefs

	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.google.appengine.eclipse.core.prefs

	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.google.gdt.eclipse.suite.prefs

	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.google.gwt.eclipse.core.prefs

	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.egit.core.prefs

	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs

	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.core.prefs

	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.ui.prefs

	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs

	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs

	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.jsdt.ui.prefs

	.metadata/.plugins/org.eclipse.debug.core/.launches/GuilfordProject.launch
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/1028199574.index
	.metadata/.plugins/org.eclipse.jdt.core/1065832147.index
	.metadata/.plugins/org.eclipse.jdt.core/1574318262.index
	.metadata/.plugins/org.eclipse.jdt.core/1604200090.index
	.metadata/.plugins/org.eclipse.jdt.core/1832949699.index
	.metadata/.plugins/org.eclipse.jdt.core/1877021558.index
	.metadata/.plugins/org.eclipse.jdt.core/1947431546.index
	.metadata/.plugins/org.eclipse.jdt.core/2010347537.index
	.metadata/.plugins/org.eclipse.jdt.core/2193799835.index
	.metadata/.plugins/org.eclipse.jdt.core/2338776811.index
	.metadata/.plugins/org.eclipse.jdt.core/2486087126.index
	.metadata/.plugins/org.eclipse.jdt.core/2743915309.index
	.metadata/.plugins/org.eclipse.jdt.core/3095963708.index
	.metadata/.plugins/org.eclipse.jdt.core/3454125809.index
	.metadata/.plugins/org.eclipse.jdt.core/3598813974.index
	.metadata/.plugins/org.eclipse.jdt.core/3991718231.index
	.metadata/.plugins/org.eclipse.jdt.core/4004133052.index
	.metadata/.plugins/org.eclipse.jdt.core/828133061.index
	.metadata/.plugins/org.eclipse.jdt.core/834584462.index
	.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml

	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2014/11/47/refactorings.history

	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2014/11/47/refactorings.index

	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/GuilfordProject/2014/11/47/refactorings.history

	.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/GuilfordProject/2014/11/47/refactorings.index
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	.metadata/.plugins/org.eclipse.wst.sse.core/task-tags.properties
	.metadata/version.ini
	.recommenders/caches/identified-project-coordinates.json

	.recommenders/repository/http___download_eclipse_org_recommenders_models_luna_/org/eclipse/recommenders/index/0.0.0-SNAPSHOT/_remote.repositories

	.recommenders/repository/http___download_eclipse_org_recommenders_models_luna_/org/eclipse/recommenders/index/0.0.0-SNAPSHOT/resolver-status.properties