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

上下都有
Merge branch 'devlop' into feature/bird1204

Conflicts:
	miniGame/recipesWithICarouselViewController.m
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 'feature/keeliker' into devlop
Merge branch 'devlop' into feature/bird1204
上圖
食材圖片完成只差更新ＳＱＬ
上圖
Merge branch 'feature/bird1204' into devlop

Conflicts:
	miniGame/materialWithCollectionViewController.m
Merge branch 'devlop' into feature/keeliker