Merge branch 'devlop' into feature/keeliker
版面移動＋最後一頁地返回鍵
Merge branch 'devlop' into feature/bird1204
Merge branch 'feature/leo2991' into devlop
Merge branch 'devlop' into feature/bird1204
debug中 collection
影片教學
剩研究collecion複選
Merge branch 'feature/keeliker' into devlop

Conflicts:
	miniGame.xcodeproj/project.pbxproj
	miniGame/AppDelegate.m
Merge branch 'feature/leo2991' into devlop

Conflicts:
	miniGame.xcodeproj/project.pbxproj
	miniGame/AppDelegate.m
merge conflict fix
Merge branch 'devlop' into feature/bird1204

Conflicts:
	miniGame.xcodeproj/project.pbxproj
	miniGame/procedureStepViewController.h
	miniGame/procedureStepViewController.m
	miniGame/procedureStepViewController.xib
	miniGame/procedureWithMPFlipViewController.m
	miniGame/recipesWithICarouselViewController.m
ㄍㄟˇㄎㄧˇㄕˇㄘㄢ ㄕㄨˋ
Merge branch 'devlop' into feature/keeliker
canuse
canShowStep
食譜步驟完成
timeline 我成功了
asyncImage DONE
步驟傳值（剛剛沒發現寫死的）