小修改
Merge branch 'UserControl' of github.com:shanfresh/BDExtjs into UserControl

Conflicts:
	admin.php
	app.php
修改管理员的用户账户控制到数据库中