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

Conflicts:
	api/server.js
added *.orig
changed layout
edit
edit
Adding new controller file with two methods that will be required. Need to add in 'get single CP' method to populate the screen.
Added method stub to populate a single CP.
Separated the Policy and Policies domain. Tidied up the Policy controller. Included the Policy controller in the index.html file.
Tidied up Cancellationpolicies controller - removed unnecessary functions. Add Screen is using cancellationPolicy controller now.
implementation of populateSingleCancellationPolicy in CancellationPolicyController
prefill field edit screen
showing id value in edit screen
Merged with master, cancellationPolicies added