edit xml
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/FragmentFavorite.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/FragmentSearch.class
	App/bin/classes/ca/ualberta/app/activity/LoginActivity.class
	App/bin/classes/ca/ualberta/app/activity/QuestionDetailActivity.class
	App/bin/classes/ca/ualberta/app/activity/R$id.class
	App/bin/classes/ca/ualberta/app/activity/R$layout.class
	App/bin/classes/ca/ualberta/app/activity/R$menu.class
	App/bin/classes/ca/ualberta/app/activity/R$string.class
	App/bin/classes/ca/ualberta/app/activity/R$style.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/gen/ca/ualberta/app/activity/R.java
	App/res/values/strings.xml