Add javadoc
Merge branch 'master' of https://github.com/CMPUT301F14T06/Team06MapleSyrup

Conflicts:
	App/bin/classes/ca/ualberta/app/ESmanager/AuthorMapManager.class
	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$6.class
	App/bin/classes/ca/ualberta/app/activity/FragmentMain$7$2.class
	App/bin/classes/ca/ualberta/app/activity/FragmentMain$SearchThread.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/MainActivity.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/MyLocalActivity$3.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/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.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/QuestionListController.class
	App/bin/classes/ca/ualberta/app/models/AuthorMapIO.class
	App/bin/classes/ca/ualberta/app/thread/UpdateAnswerThread.class
	App/bin/classes/ca/ualberta/app/thread/UpdateAuthorThread.class
	App/bin/classes/ca/ualberta/app/thread/UpdateQuestionThread.class
	App/bin/classes/ca/ualberta/app/view/ScrollListView.class