WaitingList is avaliable
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/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$AddQuestionThread.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$2.class
	App/bin/classes/ca/ualberta/app/activity/FragmentMain$5.class
	App/bin/classes/ca/ualberta/app/activity/FragmentMain$6.class
	App/bin/classes/ca/ualberta/app/activity/FragmentMain$7$1.class
	App/bin/classes/ca/ualberta/app/activity/FragmentMain$7$2.class
	App/bin/classes/ca/ualberta/app/activity/FragmentMain$7.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$SearchThread.class
	App/bin/classes/ca/ualberta/app/activity/FragmentMain$change_category_click.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$AddThread.class
	App/bin/classes/ca/ualberta/app/activity/LoginActivity.class
	App/bin/classes/ca/ualberta/app/activity/MyFavoriteActivity$2.class
	App/bin/classes/ca/ualberta/app/activity/MyFavoriteActivity$3.class
	App/bin/classes/ca/ualberta/app/activity/MyFavoriteActivity$4$1.class
	App/bin/classes/ca/ualberta/app/activity/MyFavoriteActivity$4$2.class
	App/bin/classes/ca/ualberta/app/activity/MyFavoriteActivity$4.class
	App/bin/classes/ca/ualberta/app/activity/MyFavoriteActivity$DeleteThread.class
	App/bin/classes/ca/ualberta/app/activity/MyFavoriteActivity$GetListThread.class
	App/bin/classes/ca/ualberta/app/activity/MyFavoriteActivity$change_category_click.class
	App/bin/classes/ca/ualberta/app/activity/MyFavoriteActivity.class
	App/bin/classes/ca/ualberta/app/activity/MyLocalActivity$2.class
	App/bin/classes/ca/ualberta/app/activity/MyLocalActivity$3.class
	App/bin/classes/ca/ualberta/app/activity/MyLocalActivity$4$1.class
	App/bin/classes/ca/ualberta/app/activity/MyLocalActivity$4$2.class
	App/bin/classes/ca/ualberta/app/activity/MyLocalActivity$4.class
	App/bin/classes/ca/ualberta/app/activity/MyLocalActivity$DeleteThread.class
	App/bin/classes/ca/ualberta/app/activity/MyLocalActivity$GetListThread.class
	App/bin/classes/ca/ualberta/app/activity/MyLocalActivity$change_category_click.class
	App/bin/classes/ca/ualberta/app/activity/MyLocalActivity.class
	App/bin/classes/ca/ualberta/app/activity/MyQuestionActivity$3.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/WaitingListActivity$3.class
	App/bin/classes/ca/ualberta/app/activity/WaitingListActivity.class
	App/bin/classes/ca/ualberta/app/adapter/AnswerListAdapter$AddReplyOnClickListener.class
	App/bin/classes/ca/ualberta/app/adapter/AnswerListAdapter$ViewHolder_answer.class
	App/bin/classes/ca/ualberta/app/adapter/AnswerListAdapter$ViewHolder_reply.class
	App/bin/classes/ca/ualberta/app/adapter/AnswerListAdapter$ViewImageOnClickListener$1.class
	App/bin/classes/ca/ualberta/app/adapter/AnswerListAdapter$ViewImageOnClickListener.class
	App/bin/classes/ca/ualberta/app/adapter/AnswerListAdapter.class
	App/bin/classes/ca/ualberta/app/adapter/QuestionListAdapter$favOnClickListener.class
	App/bin/classes/ca/ualberta/app/adapter/QuestionListAdapter$saveOnClickListener.class
	App/bin/classes/ca/ualberta/app/adapter/QuestionListAdapter$upvoteOnClickListener.class
	App/bin/classes/ca/ualberta/app/adapter/QuestionListAdapter.class
	App/bin/classes/ca/ualberta/app/adapter/ReplyListAdapter.class
	App/bin/classes/ca/ualberta/app/controller/CacheController.class
	App/bin/classes/ca/ualberta/app/controller/PushController.class
	App/bin/classes/ca/ualberta/app/gps/ShowLocationActivity.class
	App/bin/classes/ca/ualberta/app/view/ScrollListView.class
	App/bin/classes/ca/ualberta/app/view/ScrollListViewFooter.class
	App/bin/classes/ca/ualberta/app/view/ScrollListViewHeader.class
	App/bin/resources.ap_
	App/src/ca/ualberta/app/activity/MyFavoriteActivity.java
	App/src/ca/ualberta/app/activity/MyLocalActivity.java
	App/src/ca/ualberta/app/activity/QuestionDetailActivity.java
	App/src/ca/ualberta/app/adapter/AnswerListAdapter.java