fav and local still have bug
edit main and search activity
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$1.class
	App/bin/classes/ca/ualberta/app/ESmanager/QuestionListManager$2.class
	App/bin/classes/ca/ualberta/app/ESmanager/QuestionListManager.class
	App/bin/classes/ca/ualberta/app/activity/FragmentFavorite.class
	App/bin/classes/ca/ualberta/app/activity/FragmentMain$2.class
	App/bin/classes/ca/ualberta/app/activity/FragmentMain$3.class
	App/bin/classes/ca/ualberta/app/activity/FragmentMain$DeleteThread.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/FragmentSearch.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/adapter/QuestionListAdapter.class
	App/bin/classes/ca/ualberta/app/adapter/ViewHolder.class
	App/bin/classes/ca/ualberta/app/controller/CacheController$1.class
	App/bin/classes/ca/ualberta/app/controller/CacheController.class
	App/bin/resources.ap_
	App/src/ca/ualberta/app/ESmanager/QuestionListManager.java
	App/src/ca/ualberta/app/activity/FragmentMain.java
	App/src/ca/ualberta/app/activity/QuestionDetailActivity.java
	App/src/ca/ualberta/app/adapter/QuestionListAdapter.java