Reorganize boilerplates.
Merge remote-tracking branch 'skeleton/master'

Conflicts:
	draft.xml.template
Update the example external entity.
Merge remote-tracking branch 'skeleton/master'

Conflicts:
	README.md
	draft.xml.template
Finalize the draft.