Update 3.02

- Something is happening to GitHub again
Merge remote-tracking branch 'origin/master' into Eric

Conflicts:
	LightweightIMClient/LightweightIMClient.v11.suo