Marriage Abroad - September Ticket

* Copy change for Same Sex German marriage
* Remove alert message from consular_cni_os_all_names_but_germany
* Remove redundant alert messages
* Remove warning message from Cambodia
* More Colombia changes
* Reformat Macedonia embassy contact details
* Only need to wait 7 days after notice of marriage not 21
* British Embassy not British embassy
Merge pull request #1212 from alphagov/marriage-abroad-changes

Marriage Abroad Changes