geo passing intents
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
geo in questions
Merge pull request #102 from aktse/master

merging
geo in questions now
geo question
trying to solve confilct
Merge pull request #103 from diego04/master

latitude longitude in questions
fixed conflict
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk
Merge pull request #104 from diego04/master

fix merge conflicts
fixed a bug when upvoting
geo
Merge branch 'master' of https://github.com/CMPUT301F14T12/OctoAsk
Merge pull request #105 from ibarreto/master

fixed important bug!
geolocation on answer questions and reply
updated some test cases
merging
fix conflict
Merge pull request #106 from diego04/master

geolocation on question answer and reply