Merge pull request #150 from DFID/Null_Document_Type_Fix

Update the code to cope with null document types and change the Yemen country description

data/countries.json

@@ -2719,7 +2719,7 @@
   {
     "code":"YE",
     "name":"Yemen",
-    "description":"Yemen faces multiple development challenges compounded by serious political crisis and conflict in 2011. Even before the crisis Yemen was the poorest country in the Middle East with worrying human development indicators and rapid population growth. The crisis led to large scale internal displacement and hunger, with 60% of the population needing humanitarian assistance. Ten million Yemenis do not have enough to eat and 1 million young children suffer from acute malnutrition. Women and girls suffer severe discrimination.\n\n## Top priorities\n* more stable, secure and prosperous Yemen\n* political transition\n* early recovery and humanitarian needs\n\n## Further resources\n[DFID Operational Plan for Yemen](https://www.gov.uk/government/publications/dfid-yemen-operational-plan-2014)\n\n[Yemen page on GOV.UK website](https://www.gov.uk/government/world/yemen)",
+    "description":"The humanitarian situation in Yemen is now one of the worst humanitarian crises in the world. The United Nations estimates that more than 80% of the population (21.2 million) are in need of humanitarian aid. 14.4 million require food assistance, of which 7.6 million are currently considered severely food insecure. Around 2.5 million people have been displaced since March 2015 and basic services have been severely affected. Even before the current crisis Yemen was the poorest country in the Middle East, and faces a range of deep-seated development challenges including high levels of poverty, food insecurity, high population growth, a weak economy and gender inequality.\n\n## Further resources\n[DFID Operational Plan for Yemen](https://www.gov.uk/government/publications/dfid-yemen-operational-plan-2014)\n\n[Yemen page on GOV.UK website](https://www.gov.uk/government/world/yemen)\n",
     "population":22763000,
     "lifeExpectancy":65.03046341,
     "incomeLevel":"Lower middle income",

views/projects/documents.html.erb

@@ -27,7 +27,7 @@
                          </td>
                       <% end %>    
                       <td scope="col">
-                        <%= iati_mime_type document['format']['code'] %>
+                        <%= if !document['format'].nil? then iati_mime_type document['format']['code'] else "" end %> 
                       </td>
                       <td scope="col">
                         <% document['categories'].each do |category| %>