modify offline my questions
Merge branch 'master' of https://github.com/CMPUT301F14T06/Team06MapleSyrup

Conflicts:
	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/activity/QuestionDetailActivity.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/doc/javadoc/allclasses-frame.html
	App/doc/javadoc/allclasses-noframe.html
	App/doc/javadoc/ca/ualberta/app/ESmanager/AuthorMapManager.html
	App/doc/javadoc/ca/ualberta/app/ESmanager/QuestionListManager.html
	App/doc/javadoc/ca/ualberta/app/ESmanager/class-use/AuthorMapManager.html
	App/doc/javadoc/ca/ualberta/app/ESmanager/class-use/QuestionListManager.html
	App/doc/javadoc/ca/ualberta/app/ESmanager/package-frame.html
	App/doc/javadoc/ca/ualberta/app/ESmanager/package-summary.html
	App/doc/javadoc/ca/ualberta/app/ESmanager/package-tree.html
	App/doc/javadoc/ca/ualberta/app/ESmanager/package-use.html
	App/doc/javadoc/ca/ualberta/app/activity/BuildConfig.html
	App/doc/javadoc/ca/ualberta/app/activity/R.array.html
	App/doc/javadoc/ca/ualberta/app/activity/R.attr.html
	App/doc/javadoc/ca/ualberta/app/activity/R.color.html
	App/doc/javadoc/ca/ualberta/app/activity/R.dimen.html
	App/doc/javadoc/ca/ualberta/app/activity/R.drawable.html
	App/doc/javadoc/ca/ualberta/app/activity/R.html
	App/doc/javadoc/ca/ualberta/app/activity/R.id.html
	App/doc/javadoc/ca/ualberta/app/activity/R.layout.html
	App/doc/javadoc/ca/ualberta/app/activity/R.menu.html
	App/doc/javadoc/ca/ualberta/app/activity/R.string.html
	App/doc/javadoc/ca/ualberta/app/activity/R.style.html
	App/doc/javadoc/ca/ualberta/app/activity/class-use/BuildConfig.html
	App/doc/javadoc/ca/ualberta/app/activity/class-use/R.array.html
	App/doc/javadoc/ca/ualberta/app/activity/class-use/R.attr.html
	App/doc/javadoc/ca/ualberta/app/activity/class-use/R.color.html
	App/doc/javadoc/ca/ualberta/app/activity/class-use/R.dimen.html
	App/doc/javadoc/ca/ualberta/app/activity/class-use/R.drawable.html
	App/doc/javadoc/ca/ualberta/app/activity/class-use/R.html
	App/doc/javadoc/ca/ualberta/app/activity/class-use/R.id.html
	App/doc/javadoc/ca/ualberta/app/activity/class-use/R.layout.html
	App/doc/javadoc/ca/ualberta/app/activity/class-use/R.menu.html
	App/doc/javadoc/ca/ualberta/app/activity/class-use/R.string.html
	App/doc/javadoc/ca/ualberta/app/activity/class-use/R.style.html
	App/doc/javadoc/ca/ualberta/app/activity/package-frame.html
	App/doc/javadoc/ca/ualberta/app/activity/package-summary.html
	App/doc/javadoc/ca/ualberta/app/activity/package-tree.html
	App/doc/javadoc/ca/ualberta/app/activity/package-use.html
	App/doc/javadoc/ca/ualberta/app/comparator/AnswerUpvoteComparator.html
	App/doc/javadoc/ca/ualberta/app/comparator/DateComparator.html
	App/doc/javadoc/ca/ualberta/app/comparator/PictureComparator.html
	App/doc/javadoc/ca/ualberta/app/comparator/QuestionUpvoteComparator.html
	App/doc/javadoc/ca/ualberta/app/comparator/ScoreComparator.html
	App/doc/javadoc/ca/ualberta/app/comparator/class-use/AnswerUpvoteComparator.html
	App/doc/javadoc/ca/ualberta/app/comparator/class-use/DateComparator.html
	App/doc/javadoc/ca/ualberta/app/comparator/class-use/PictureComparator.html
	App/doc/javadoc/ca/ualberta/app/comparator/class-use/QuestionUpvoteComparator.html
	App/doc/javadoc/ca/ualberta/app/comparator/class-use/ScoreComparator.html
	App/doc/javadoc/ca/ualberta/app/comparator/package-frame.html
	App/doc/javadoc/ca/ualberta/app/comparator/package-summary.html
	App/doc/javadoc/ca/ualberta/app/comparator/package-tree.html
	App/doc/javadoc/ca/ualberta/app/comparator/package-use.html
	App/doc/javadoc/ca/ualberta/app/controller/CacheController.html
	App/doc/javadoc/ca/ualberta/app/controller/PushController.html
	App/doc/javadoc/ca/ualberta/app/controller/QuestionListController.html
	App/doc/javadoc/ca/ualberta/app/controller/class-use/CacheController.html
	App/doc/javadoc/ca/ualberta/app/controller/class-use/PushController.html
	App/doc/javadoc/ca/ualberta/app/controller/class-use/QuestionListController.html
	App/doc/javadoc/ca/ualberta/app/controller/package-frame.html
	App/doc/javadoc/ca/ualberta/app/controller/package-summary.html
	App/doc/javadoc/ca/ualberta/app/controller/package-tree.html
	App/doc/javadoc/ca/ualberta/app/controller/package-use.html
	App/doc/javadoc/ca/ualberta/app/models/Answer.html
	App/doc/javadoc/ca/ualberta/app/models/Author.html
	App/doc/javadoc/ca/ualberta/app/models/AuthorMap.html
	App/doc/javadoc/ca/ualberta/app/models/AuthorMapIO.html
	App/doc/javadoc/ca/ualberta/app/models/InputsModel.html
	App/doc/javadoc/ca/ualberta/app/models/Question.html
	App/doc/javadoc/ca/ualberta/app/models/QuestionList.html
	App/doc/javadoc/ca/ualberta/app/models/Reply.html
	App/doc/javadoc/ca/ualberta/app/models/User.html
	App/doc/javadoc/ca/ualberta/app/models/class-use/Answer.html
	App/doc/javadoc/ca/ualberta/app/models/class-use/Author.html
	App/doc/javadoc/ca/ualberta/app/models/class-use/AuthorMap.html
	App/doc/javadoc/ca/ualberta/app/models/class-use/AuthorMapIO.html
	App/doc/javadoc/ca/ualberta/app/models/class-use/InputsModel.html
	App/doc/javadoc/ca/ualberta/app/models/class-use/Question.html
	App/doc/javadoc/ca/ualberta/app/models/class-use/QuestionList.html
	App/doc/javadoc/ca/ualberta/app/models/class-use/Reply.html
	App/doc/javadoc/ca/ualberta/app/models/class-use/User.html
	App/doc/javadoc/ca/ualberta/app/models/package-frame.html
	App/doc/javadoc/ca/ualberta/app/models/package-summary.html
	App/doc/javadoc/ca/ualberta/app/models/package-tree.html
	App/doc/javadoc/ca/ualberta/app/models/package-use.html
	App/doc/javadoc/ca/ualberta/app/network/InternetConnectionChecker.html
	App/doc/javadoc/ca/ualberta/app/network/class-use/InternetConnectionChecker.html
	App/doc/javadoc/ca/ualberta/app/network/data/Hits.html
	App/doc/javadoc/ca/ualberta/app/network/data/SearchCommand.html
	App/doc/javadoc/ca/ualberta/app/network/data/SearchHit.html
	App/doc/javadoc/ca/ualberta/app/network/data/SearchResponse.html
	App/doc/javadoc/ca/ualberta/app/network/data/class-use/Hits.html
	App/doc/javadoc/ca/ualberta/app/network/data/class-use/SearchCommand.html
	App/doc/javadoc/ca/ualberta/app/network/data/class-use/SearchHit.html
	App/doc/javadoc/ca/ualberta/app/network/data/class-use/SearchResponse.html
	App/doc/javadoc/ca/ualberta/app/network/data/package-frame.html
	App/doc/javadoc/ca/ualberta/app/network/data/package-summary.html
	App/doc/javadoc/ca/ualberta/app/network/data/package-tree.html
	App/doc/javadoc/ca/ualberta/app/network/data/package-use.html
	App/doc/javadoc/ca/ualberta/app/network/package-frame.html
	App/doc/javadoc/ca/ualberta/app/network/package-summary.html
	App/doc/javadoc/ca/ualberta/app/network/package-tree.html
	App/doc/javadoc/ca/ualberta/app/network/package-use.html
	App/doc/javadoc/ca/ualberta/app/thread/UpdateAnswerThread.html
	App/doc/javadoc/ca/ualberta/app/thread/UpdateAuthorThread.html
	App/doc/javadoc/ca/ualberta/app/thread/UpdateQuestionThread.html
	App/doc/javadoc/ca/ualberta/app/thread/class-use/UpdateAnswerThread.html
	App/doc/javadoc/ca/ualberta/app/thread/class-use/UpdateAuthorThread.html
	App/doc/javadoc/ca/ualberta/app/thread/class-use/UpdateQuestionThread.html
	App/doc/javadoc/ca/ualberta/app/thread/package-frame.html
	App/doc/javadoc/ca/ualberta/app/thread/package-summary.html
	App/doc/javadoc/ca/ualberta/app/thread/package-tree.html
	App/doc/javadoc/ca/ualberta/app/thread/package-use.html
	App/doc/javadoc/constant-values.html
	App/doc/javadoc/deprecated-list.html
	App/doc/javadoc/help-doc.html
	App/doc/javadoc/index-files/index-1.html
	App/doc/javadoc/index-files/index-10.html
	App/doc/javadoc/index-files/index-11.html
	App/doc/javadoc/index-files/index-12.html
	App/doc/javadoc/index-files/index-14.html
	App/doc/javadoc/index-files/index-15.html
	App/doc/javadoc/index-files/index-16.html
	App/doc/javadoc/index-files/index-17.html
	App/doc/javadoc/index-files/index-18.html
	App/doc/javadoc/index-files/index-19.html
	App/doc/javadoc/index-files/index-2.html
	App/doc/javadoc/index-files/index-20.html
	App/doc/javadoc/index-files/index-21.html
	App/doc/javadoc/index-files/index-3.html
	App/doc/javadoc/index-files/index-4.html
	App/doc/javadoc/index-files/index-5.html
	App/doc/javadoc/index-files/index-6.html
	App/doc/javadoc/index-files/index-7.html
	App/doc/javadoc/index-files/index-8.html
	App/doc/javadoc/index-files/index-9.html
	App/doc/javadoc/index.html
	App/doc/javadoc/overview-frame.html
	App/doc/javadoc/overview-summary.html
	App/doc/javadoc/overview-tree.html
	App/doc/javadoc/package-list
	App/src/ca/ualberta/app/activity/CreateAnswerActivity.java
	App/src/ca/ualberta/app/activity/CreateAnswerReplyActivity.java
	App/src/ca/ualberta/app/activity/CreateQuestionActivity.java
	App/src/ca/ualberta/app/activity/CreateQuestionReplyActivity.java
	App/src/ca/ualberta/app/activity/LoginActivity.java
	App/src/ca/ualberta/app/activity/MyLocalActivity.java
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/QuestionDetailActivity$1.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$favOnClickListener.class
	App/bin/classes/ca/ualberta/app/adapter/QuestionListAdapter$saveOnClickListener.class
	App/bin/classes/ca/ualberta/app/adapter/QuestionListAdapter.class
	App/bin/resources.ap_
	App/src/ca/ualberta/app/activity/QuestionDetailActivity.java