Merge branch 'devlop' into feature/bird1204
Merge branch 'feature/keeliker' into devlop
pullToRefresh & updateLocation

下拉即更新 和 城市啓動就上傳位置
整理程式
Merge branch 'feature/bird1204' into devlop
Merge branch 'feature/keeliker' into devlop

Conflicts:
	miniGame.xcodeproj/project.pbxproj
	miniGame/AppDelegate.m
Merge branch 'devlop' into feature/bird1204
整理高的程式
Merge branch 'feature/bird1204' into devlop
profileSideView
Merge branch 'devlop' into feature/bird1204
aboutUs
整理程式
Merge branch 'feature/bird1204' into devlop
Merge branch 'devlop' into feature/keeliker
hhh
Merge branch 'feature/keeliker' into devlop