Merge branch 'devlop' into feature/bird1204
icarousel 的pull to refresh

上下都有
選食材換食譜
最新進度：'銀杏,碗豆莢,新鮮百合'
ㄏㄏ
改名 成功使回傳直以逗號引號分開
Merge branch 'feature/keeliker' into devlop
Merge branch 'devlop' into feature/bird1204

Conflicts:
	miniGame/recipesWithICarouselViewController.m
Merge branch 'devlop' into feature/keeliker
Merge remote-tracking branch 'origin/feature/leo2991' into devlop

Conflicts:
	miniGame/GetJsonURLString.h
做新的頁面存食材轉食譜
Merge branch 'devlop' into feature/keeliker

Conflicts:
	miniGame/recipesWithICarouselViewController.m
devlop
random 所選食材
GetJsonURLString_RecipeByNames Fail
edit
Merge branch 'feature/keeliker' into devlop
jsonKit 拿掉，優化timeline，分享，讚，評分
ＴＭＤ 以後提醒我不要做類似美工的東西
Merge branch 'devlop' into feature/bird1204

Conflicts:
	miniGame.xcodeproj/project.pbxproj
	miniGame/GetJsonURLString.h
	miniGame/materialWithCollectionViewController.m
	miniGame/recipesWithICarouselViewController.m
	miniGame/refViewController.m
Merge branch 'devlop' into feature/keeliker
除了圖還是放圖