trim curly braces from UUIDs used as app IDs
Merge branch 'master' into trim-uuids

Conflicts:
	addon/lib/simulator.js
update xkeys if the last version was earlier than 3.0pre3, when we landed the trim UUIDs fix
Merge pull request #347 from mykmelez/trim-uuids

trim curly braces from UUIDs used as app IDs