Merge remote-tracking branch 'origin/DEV_Branch' into DEV_功課表
暫時用uitableView開啓檔案
add Calendar
改變icon順序
Merge remote-tracking branch 'refs/remotes/origin/Dev_Calender' into DEV_Branch
bug fixed
Merge remote-tracking branch 'origin/DEV_功課表' into DEV_Branch

Conflicts:
	NTOU_Mobile.xcodeproj/project.pbxproj
Bug fixed
Deafault changed
國光完成
finish fuho.plist
福和客運完成
Merge remote-tracking branch 'refs/remotes/origin/福合客運' into DEV_Branch
生活圈 key好店家名稱
測試1
FIX_校舍經緯度 更新最新版
key完資料 生活圈更新完成
Merge remote-tracking branch 'origin/生活圈' into DEV_Branch

Conflicts:
	NTOU_Mobile.xcodeproj/project.pbxproj
Merge remote-tracking branch 'origin/FIX_校舍經緯度' into DEV_Branch

Conflicts:
	NTOU_Mobile/MainStoryboard.storyboard
國光界面中 未完成