食譜連上新資料庫
navigation Bar Hide & friend 連新資料庫
改friend 顯示 名稱，裝置

整理今天一整天的程式
Merge branch 'feature/bird1204' into devlop
materialSide連新資料庫
Merge branch 'devlop' into feature/keeliker

Conflicts:
	miniGame/SideMenuViewController.m
	miniGame/WebJsonDataGetter.h
	miniGame/materialSideViewController.m
	miniGame/menuViewController.m
test
刪掉了好爽