Merge remote-tracking branch 'origin/master'

Conflicts:
	App/bin/classes/ca/ualberta/app/activity/CreateAnswerActivity.class
	App/bin/classes/ca/ualberta/app/activity/CreateQuestionActivity.class
	App/bin/classes/ca/ualberta/app/activity/FragmentFavorite.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/FragmentSearch.class
	App/bin/classes/ca/ualberta/app/activity/LoginActivity.class
	App/bin/classes/ca/ualberta/app/activity/MainActivity$1.class
	App/bin/classes/ca/ualberta/app/activity/MainActivity.class
	App/bin/classes/ca/ualberta/app/activity/MyQuestionActivity.class
	App/bin/classes/ca/ualberta/app/activity/QuestionDetailActivity$1.class
	App/bin/classes/ca/ualberta/app/activity/QuestionDetailActivity$2.class

	App/bin/classes/ca/ualberta/app/activity/QuestionDetailActivity$GetThread.class
	App/bin/classes/ca/ualberta/app/activity/QuestionDetailActivity.class
	App/bin/classes/ca/ualberta/app/activity/R$id.class
	App/bin/classes/ca/ualberta/app/activity/R$layout.class
	App/bin/classes/ca/ualberta/app/activity/R$menu.class
	App/bin/classes/ca/ualberta/app/activity/R$string.class
	App/bin/classes/ca/ualberta/app/activity/R$style.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/adapter/ReplyAdapter.class