AS
Merge branch 'master' of https://github.com/qulijiao/trusteeship

Conflicts:
	sushe/src/com/bean/trusteeship/RosterBean.java
	sushe/src/com/dao/trsteeship/RosterManagerDao.java