compiling for green advisor
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