modify cache function
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/FragmentMain.class
	App/bin/classes/ca/ualberta/app/activity/FragmentSearch.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/QuestionListAdapter$UpdateThread.class
	App/bin/classes/ca/ualberta/app/adapter/QuestionListAdapter$upvoteOnClickListener.class
	App/bin/classes/ca/ualberta/app/adapter/QuestionListAdapter.class
	App/bin/classes/ca/ualberta/app/adapter/ViewHolder.class
	App/bin/classes/ca/ualberta/app/models/Answer.class
	App/bin/classes/ca/ualberta/app/models/Question.class
	App/bin/resources.ap_
	App/src/ca/ualberta/app/models/Answer.java
	App/src/ca/ualberta/app/models/Question.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/adapter/QuestionListAdapter$UpdateThread.class
	App/bin/classes/ca/ualberta/app/adapter/QuestionListAdapter$upvoteOnClickListener.class
	App/bin/classes/ca/ualberta/app/adapter/QuestionListAdapter.class
	App/bin/classes/ca/ualberta/app/adapter/ViewHolder.class
	App/src/ca/ualberta/app/adapter/QuestionListAdapter.java