Geolocation from text or gps
Merge branch 'master' of https://github.com/CMPUT301F14T16/QuestionAppProject

Conflicts:
	EasyA-Android/src/ca/ualberta/cmput301f14t16/easya/View/SubmitAnswerActivity.java
	EasyA-Android/src/ca/ualberta/cmput301f14t16/easya/View/SubmitQuestionActivity.java