vvv
finish timelineView no mangon
Merge remote-tracking branch 'origin/feature/leo2991' into devlop

Conflicts:
	miniGame/GetJsonURLString.h
Merge branch 'devlop' into feature/keeliker

Conflicts:
	miniGame/recipesWithICarouselViewController.m