Merge pull request #1 from FIU-SCIS-Senior-Project-2014-Fall/monica

Edit profile, new user, log in
Implemented Recycling Locations Near By
Merge remote-tracking branch 'origin/monica'
Merge remote-tracking branch 'origin/monica'
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
test 2
test 3
Test 4

Merge remote-tracking branch 'origin/George_v1'

Conflicts:
	ECOSustainabilityEffortsProject/apps/ECOSustainabilityEfforts/common/css/style.css
	ECOSustainabilityEffortsProject/apps/ECOSustainabilityEfforts/common/js/controllers/editProfile.js
	ECOSustainabilityEffortsProject/apps/ECOSustainabilityEfforts/common/js/controllers/newUser.js
	ECOSustainabilityEffortsProject/apps/ECOSustainabilityEfforts/common/views/editProfile.html
	ECOSustainabilityEffortsProject/apps/ECOSustainabilityEfforts/common/views/navbar-app.html
	ECOSustainabilityEffortsProject/apps/ECOSustainabilityEfforts/common/views/newUser.html
test 5
Merge remote-tracking branch 'origin/master' into monica