I've done the offline Question detail
Merge remote-tracking branch 'origin/master'

Conflicts:
	App/bin/App.apk
	App/bin/classes.dex
	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$DeleteThread.class

	App/bin/classes/ca/ualberta/app/activity/FragmentMain$GetMapThread.class
	App/bin/classes/ca/ualberta/app/activity/FragmentMain.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/WaitingListActivity$3.class
	App/bin/classes/ca/ualberta/app/activity/WaitingListActivity.class
	App/bin/classes/ca/ualberta/app/controller/CacheController$1.class
	App/bin/classes/ca/ualberta/app/controller/CacheController$2.class
	App/bin/classes/ca/ualberta/app/controller/CacheController.class
	App/bin/classes/ca/ualberta/app/gps/ShowLocationActivity.class
	App/bin/resources.ap_
	App/src/ca/ualberta/app/activity/FragmentMain.java
	App/src/ca/ualberta/app/controller/CacheController.java