References.
Merge branch 'master' of https://github.com/otroan/MAP

Conflicts:
	draft-ietf-softwire-map-dhcp.xml
Removed compact to avoid too many figure page breaks.