f
update plist format to ios6
Merge branch 'devlop' into feature/keeliker
working with MFSideView
t
連資料庫

顧名思義
Merge branch 'feature/bird1204' into devlop

Conflicts:
	miniGame/AppDelegate.m
	miniGame/en.lproj/ViewController.xib
	miniGame/entryViewController.m
Merge branch 'feature/leo2991' into devlop

Conflicts:
	miniGame/AppDelegate.m
	miniGame/en.lproj/ViewController.xib
	miniGame/entryViewController.m
Merge branch 'feature/keeliker' into devlop

Conflicts:
	miniGame.xcodeproj/project.pbxproj
Merge branch 'devlop' into feature/bird1204
Revert 5e3e2d0..d0b8506

This rolls back to commit 5e3e2d03b08e48cc6f628129d48dbb565e86f521.
Merge branch 'devlop' into feature/bird1204
Merge branch 'feature/bird1204' into devlop
m
Merge branch 'feature/keeliker' into devlop

Conflicts:
	miniGame.xcodeproj/project.pbxproj
	miniGame/menuViewController.h
	miniGame/menuViewController.m
	miniGame/menuViewController.xib
	miniGame/refViewController.m
rr
手動整合
Merge branch 'devlop' into feature/bird1204

Conflicts:
	miniGame/entryViewController.xib
篩選按鈕傳值

原本沒合到sor
Merge branch 'devlop' into feature/bird1204