update

update files
Merge branch 'mike-Y'

Conflicts:
	network/packet.h
resolved