add myLocalActivity
Merge branch 'master' of https://github.com/CMPUT301F14T06/Team06MapleSyrup

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$4.class
	App/bin/classes/ca/ualberta/app/activity/FragmentMain$7$2.class
	App/bin/classes/ca/ualberta/app/activity/FragmentMain$DeleteThread.class
	App/bin/classes/ca/ualberta/app/activity/FragmentMain$GetListThread.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.class
	App/bin/classes/ca/ualberta/app/activity/MyFavoriteActivity$3.class
	App/bin/classes/ca/ualberta/app/activity/MyFavoriteActivity.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/adapter/AnswerListAdapter.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/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/FragmentMain.java