jdoc for favoriteQuestion
Merge branch 'master' of https://github.com/CMPUT301F14T06/Team06MapleSyrup
add jdoc
Conflicts:
	App/bin/App.apk
	App/bin/classes.dex
	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/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/resources.ap_