local and fav is avaliable Offline
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$DeleteThread.class
	App/bin/classes/ca/ualberta/app/activity/FragmentMain$GetListThread.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.class
	App/bin/classes/ca/ualberta/app/activity/MyFavoriteActivity$2.class
	App/bin/classes/ca/ualberta/app/activity/MyFavoriteActivity$3.class
	App/bin/classes/ca/ualberta/app/activity/MyFavoriteActivity$4$1.class
	App/bin/classes/ca/ualberta/app/activity/MyFavoriteActivity$4$2.class
	App/bin/classes/ca/ualberta/app/activity/MyFavoriteActivity$4.class
	App/bin/classes/ca/ualberta/app/activity/MyFavoriteActivity$DeleteThread.class
	App/bin/classes/ca/ualberta/app/activity/MyFavoriteActivity$GetListThread.class
	App/bin/classes/ca/ualberta/app/activity/MyFavoriteActivity.class
	App/bin/classes/ca/ualberta/app/activity/MyLocalActivity$2.class
	App/bin/classes/ca/ualberta/app/activity/MyLocalActivity$3.class
	App/bin/classes/ca/ualberta/app/activity/MyLocalActivity$4$1.class
	App/bin/classes/ca/ualberta/app/activity/MyLocalActivity$4$2.class
	App/bin/classes/ca/ualberta/app/activity/MyLocalActivity$4.class
	App/bin/classes/ca/ualberta/app/activity/MyLocalActivity$DeleteThread.class
	App/bin/classes/ca/ualberta/app/activity/MyLocalActivity$GetListThread.class
	App/bin/classes/ca/ualberta/app/activity/MyLocalActivity.class
	App/bin/classes/ca/ualberta/app/adapter/ViewHolder.class