1. Changed noticeIDType from base64Binary to be compatible with draft-lozano-tmch-func-spec-05.
2. Changed codeType from base64Binary to token to be more generic.
3. Updated based on feedback from Alexander Mayrhofer, which include:
   a. Changed "extension to the domain name extension" to "extension to the domain name mapping".
   b. Changed use of 2004 return code to 2306 return code when phase passed mismatches active phase and sub-phase.
   c. Changed description of "allocated" and "rejected" statuses.
Merge branch 'master' of https://github.com/jodrell/EPP-Launch-Phase-Extension-Specification

Conflicts:
	draft-tan-epp-launchphase.txt
	draft-tan-epp-launchphase.xml
Result after merging Gavin changes in.
Updated based on feedback from Alexander Mayrhofer, which include:
   Changed "extension to the domain name extension" to "extension to the domain name mapping".
   Changed use of 2004 return code to 2306 return code when phase passed mismatches active phase and sub-phase.
   Changed description of "allocated" and "rejected" statuses.
   Moved sentence on a synchronous <domain:create> command without the use of an intermediate application, then an Application Identifier MAY not be needed to the Application Identifier section.
   Restructured the Mark Validation Models section to include the "<launch:codeMark> element" sub-section, the "<mark:mark> element" sub-section, and the Digital Signature sub-section.
   Changed "Registries may" to "Registries MAY".
   Changed "extensed" to "extended" in "Availability Check Form" section.
   Broke the mix of create forms in the "EPP <create> Command" section to a fourth "Mixed Create Form" with its own sub-section.
   Removed "displayed or" from "displayed or accepted" in the <launch:acceptedDate> description.
   Replaced "given domain name is supported" with "given domain name are supported" in the "Create Response" section.
   Changed the reference of 2303 (object does not exist) in the "Security Considerations" section to 2201 (authorization error).
Update based on Alexander Mayrhofer feedback - "Added arrow from "invalid" status to "pendingAllocation" status and "pendingAllocation" status to "rejected" status in the State Transition Diagram."
split lines in diagram to make clearer (thanks Alex Mayrhofer)
Changed date to tomorrow after merging in Wil's changes.