Modify Client
Merge branch 'master' into Allen

Conflicts:
	message.h