Merge branch 'feature/bird1204' into devlop
finishViewController

finish all
only can't choose in sql
now is use plist = =
Merge branch 'merge' into devlop

Conflicts:
	miniGame/menuViewController.m
Merge branch 'devlop' into feature/bird1204