Merge pull request #110 from aktse/master

deleted dead code, added comments
geolocation sorting done
stuff
Merge pull request #111 from diego04/master

Geolocation sorting
fix null in sorting bug
Merge pull request #112 from diego04/master

fix null in sorting bug
added sorting and country and removed null bug
Merge pull request #113 from diego04/master

added sorting and country and removed null bug
compiling for green advisor
cleaning for geolocation
Merge pull request #114 from diego04/master

cleaning for geolocation
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk

Conflicts:
	OctoAskT12/bin/OctoAskT12.apk
	OctoAskT12/bin/R.txt
	OctoAskT12/bin/classes.dex
	OctoAskT12/bin/resources.ap_
	OctoAskT12/gen/cs/ualberta/octoaskt12/R.java
change location string so that if it's null, nothing appears
cleaned up code, updated javadoc, new uml
new uml
Merge pull request #115 from ibarreto/master

javadoc, cleanup, new uml
added green advisor db and report
Merge pull request #116 from ibarreto/master

added green advisor db and report
Update README.md
added questionnaire