12
Merge branch 'work1'

Conflicts:
	src/cn/lv/bean/AjaxInfoModel.java