进入前台营业之前弹出班次选择对话框，前台营业主界面能正确显示当前班次
Merge branch 'lskobe' into dev

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