edit author map
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$1.class
	App/bin/classes/ca/ualberta/app/activity/CreateQuestionActivity$2.class
	App/bin/classes/ca/ualberta/app/activity/CreateQuestionActivity$AddQuestionThread.class
	App/bin/classes/ca/ualberta/app/activity/CreateQuestionActivity$SearchAuthorThread.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$3.class
	App/bin/classes/ca/ualberta/app/activity/FragmentMain$4.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/WaitingListActivity$3.class
	App/bin/classes/ca/ualberta/app/activity/WaitingListActivity$4$1.class
	App/bin/classes/ca/ualberta/app/activity/WaitingListActivity$4$2.class
	App/bin/classes/ca/ualberta/app/activity/WaitingListActivity$4.class
	App/bin/classes/ca/ualberta/app/activity/WaitingListActivity$DeleteThread.class
	App/bin/classes/ca/ualberta/app/activity/WaitingListActivity$change_category_click.class
	App/bin/classes/ca/ualberta/app/activity/WaitingListActivity$postListThread.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/models/Question.class
	App/bin/resources.ap_
	App/src/ca/ualberta/app/activity/FragmentMain.java