Merge branch 'master' of ghghgh.us:armory-fmf-cms

1 files changed, 2 insertions, 2 deletions

diff --git a/db.json b/db.json
index a09c350..e3c14b9 100644
--- a/db.json
+++ b/db.json
@@ -2452,7 +2452,7 @@
     {
       "id": "credits",
       "title": "Credits",
-      "body": "~ Herzog & de Meuron\r\nJacques Herzog, Pierre de Meuron\r\nLuis Gisler\r\n\r\n~ Ai Weiwei Studio\r\nAi Weiwei\r\nLucas Lai, Jennifer Schmachtenberg\r\nJennifer Ng, Darryl Leung\r\n\r\n~ Park Avenue Armory\r\n\r\n~ PhotoFlight Aerial Media Services, LLC\r\nAutomated Indoor Drone System\r\n\r\n~ iart\r\nInteractive Playout System\r\n\r\n~ PRG\r\nProjection Equipment\r\n\r\n~ Sound Associates\r\nSound Equipment\r\n\r\n~ Video monitors\r\nNew City Video\r\n\r\n~ Virtual Library Research\r\nHanno Hauenstein, Berit Gilma\r\n\r\n~ Facial Recognition System\r\nAdam Harvey\r\n\r\n~ App Development\r\nJules LaPlace",
+      "body": "~ Herzog & de Meuron\r\nJacques Herzog, Pierre de Meuron\r\nLuis Gisler\r\n\r\n~ Ai Weiwei Studio Berlin\r\nAi Weiwei\r\nLucas Lai, Jennifer Schmachtenberg\r\nJennifer Ng, Darryl Leung\r\n\r\n~ iart\r\nInteractive Playout System\r\n\r\n~ PhotoFlight Aerial Media Services, LLC\r\nAutomated Indoor Drone System\r\n\r\n~ Facial Recognition System\r\nAdam Harvey\r\n\r\n~ App Development\r\nJules LaPlace\r\n\r\n~ Virtual Library Research\r\nHanno Hauenstein, Berit Gilma\r\n\r\n~ PRG\r\nProjection Equipment\r\n\r\n~ Sound Associates\r\nSound Equipment\r\n\r\n~ Video Monitors\r\nNew City Video",
       "disabled": false,
       "__index": 2,
       "dateCreated": "Sat, 13 May 2017 19:49:53 GMT",
@@ -2578,7 +2578,7 @@
     {
       "id": "drone-statistics",
       "title": "Drone Statistics",
-      "intro": "An unmanned aerial vehicle (UAV), commonly known as a drone, is an aircraft without a human pilot aboard. UAVs are a component of an unmanned aircraft system (UAS); which include a UAV, a ground-based controller, and a system of communications between the two. The flight of UAVs may operate with various degrees of autonomy: either under remote control by a human operator or autonomously by onboard computers.\r\n\r\nCompared to manned aircraft, UAVs were originally used for missions too \"dull, dirty or dangerous\" for humans. While they originated mostly in military applications, their use is rapidly expanding to commercial, scientific, recreational, agricultural, and other applications, such as policing, peacekeeping, and surveillance, product deliveries, aerial photography, agriculture, smuggling, and drone racing. Civilian drones now vastly outnumber military drones, with estimates of over a million sold by 2015, so they can be seen as an early commercial application of Autonomous Things, to be followed by the autonomous car and home robots.",
+      "intro": "An unmanned aerial vehicle (UAV), commonly known as a drone, is an aircraft without a human pilot aboard. UAVs are a component of an unmanned aircraft system, which includes a UAV, a ground-based controller, and a system of communications between the two. The flight of UAVs may operate with various degrees of autonomy: either under remote control by a human operator or autonomously by onboard computers.\r\n\r\nCompared to manned aircraft, UAVs were originally used for missions too \"dull, dirty or dangerous\" for humans. While they originated mostly in military applications, their use is rapidly expanding to commercial, scientific, recreational, agricultural, and other applications, such as policing, peacekeeping, and surveillance, product deliveries, aerial photography, agriculture, smuggling, and drone racing. Civilian drones now vastly outnumber military drones, with estimates of over a million sold by 2015, so they can be seen as an early commercial application of Autonomous Things, to be followed by the autonomous car and home robots.",
       "strikes": "2,935",
       "totalKilled": "6,382-9,240",
       "civiliansKilled": "739-1,407",