Merge pull request #185 from VirtualFlyBrain/master

Bring dev up to date
forcing Uuid update
Update update.sh
Merge branch 'master' into Dev-Server

Conflicts:
	resolved
Merge branch 'Dev-Server'