try add GPS location functionality
Merge branch 'master' of https://github.com/CMPUT301F14T06/Team06MapleSyrup

Conflicts:
	App/bin/App.apk
	App/bin/classes.dex
	App/bin/classes/ca/ualberta/app/ESmanager/AuthorMapManager.class
	App/bin/classes/ca/ualberta/app/ESmanager/QuestionListManager.class
	App/bin/classes/ca/ualberta/app/activity/CreateAnswerActivity.class
	App/bin/classes/ca/ualberta/app/activity/CreateAnswerReplyActivity.class
	App/bin/classes/ca/ualberta/app/activity/CreateQuestionActivity.class
	App/bin/classes/ca/ualberta/app/activity/CreateQuestionReplyActivity.class
	App/bin/classes/ca/ualberta/app/activity/FragmentMain.class
	App/bin/classes/ca/ualberta/app/activity/FragmentProfile$1.class
	App/bin/classes/ca/ualberta/app/activity/FragmentProfile.class
	App/bin/classes/ca/ualberta/app/activity/LoginActivity.class
	App/bin/classes/ca/ualberta/app/activity/MyFavoriteActivity.class
	App/bin/classes/ca/ualberta/app/activity/MyLocalActivity.class
	App/bin/classes/ca/ualberta/app/activity/MyQuestionActivity.class
	App/bin/classes/ca/ualberta/app/activity/QuestionDetailActivity.class
	App/bin/classes/ca/ualberta/app/activity/WaitingListActivity.class
	App/bin/classes/ca/ualberta/app/adapter/AnswerListAdapter.class
	App/bin/classes/ca/ualberta/app/adapter/QuestionListAdapter.class
	App/bin/classes/ca/ualberta/app/controller/CacheController.class
	App/bin/resources.ap_