完成了开台的操作
Merge branch 'dev' of github.com:liushuaikobe/lesheng01 into dev

Conflicts:
	src/com/bawei/lesheng/activity/front/FrontActivity.java