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

Conflicts:
	sushe/src/com/action/trusteeship/RosterManager.java