finishViewController

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

Conflicts:
	miniGame/menuViewController.m