hardcoded id
redundant letter
guid
Merge branch 'master' into feature/add-CancellationPolicies

Conflicts:
	api/server.js
added *.orig