Implemented Recycling Locations Near By
Merge remote-tracking branch 'origin/George_v1'

Conflicts:
	ECOSustainabilityEffortsProject/.settings/org.eclipse.core.resources.prefs
	ECOSustainabilityEffortsProject/adapters/SingleStepAuthAdapter/SingleStepAuthAdapter-impl.js
	ECOSustainabilityEffortsProject/adapters/SingleStepAuthAdapter/SingleStepAuthAdapter.xml
	ECOSustainabilityEffortsProject/apps/ECOSustainabilityEfforts/common/index.html
	ECOSustainabilityEffortsProject/apps/ECOSustainabilityEfforts/common/js/app.js
	ECOSustainabilityEffortsProject/bin/ECOSustainabilityEfforts-common.wlapp
	ECOSustainabilityEffortsProject/bin/ECOSustainabilityEffortsProject.war
	ECOSustainabilityEffortsProject/bin/SingleStepAuthAdapter.adapter
test