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