Construct update message to other instances
Merge branch 'master' into dev

Conflicts:
	skynet.py
moving files around
Merge branch 'dev'
moving files