From d8396faab7ebaed4b4aeb7b39dd45f19f8e5c9a3 Mon Sep 17 00:00:00 2001
From: Matt Carroll <matthewcarroll@google.com>
Date: Mon, 4 Jun 2018 09:47:59 -0700
Subject: [PATCH] Updated samples, unzipped sample agents, fixed peer
 dependency issue

Change-Id: I89f5a92d5df08aa7bf3485c199154a5a1377d1f7
---
 docs/WebhookClient.md                         |  33 +++--
 package.json                                  |   5 +-
 samples/actions-on-google/README.md           |   9 +-
 .../actions-on-google-agent.zip               | Bin 4023 -> 0 bytes
 .../actions-on-google/dialogflow-agent.zip    | Bin 0 -> 8257 bytes
 .../dialogflow-agent/agent.json               |  42 ++++++
 .../intents/Action on Google List Select.json |  35 +++++
 .../intents/Default Fallback Intent.json      |  41 ++++++
 .../intents/Default Welcome Intent.json       |  37 +++++
 .../intents/Other Intent.json                 |  28 ++++
 .../intents/Other Intent_usersays_en.json     |  14 ++
 .../dialogflow-agent/package.json             |   3 +
 .../actions-on-google/functions/package.json  |  10 +-
 samples/multi-lang-and-locale/README.md       |   8 +-
 ...ilocale-agent.zip => dialogflow-agent.zip} | Bin
 .../dialogflow-agent/agent.json               |  39 +++++
 .../intents/Default Fallback Intent.json      |  33 +++++
 .../intents/Default Welcome Intent.json       |  37 +++++
 .../Default Welcome Intent_usersays_en.json   |  13 ++
 .../Default Welcome Intent_usersays_fr.json   |  13 ++
 .../dialogflow-agent/package.json             |   3 +
 .../functions/package.json                    |   7 +-
 .../README.md                                 |   8 +-
 ...nverter-agent.zip => dialogflow-agent.zip} | Bin
 .../dialogflow-agent/agent.json               |  39 +++++
 .../entities/absoluteTempUnit.json            |   7 +
 .../entities/absoluteTempUnit_entries_en.json |  18 +++
 .../dialogflow-agent/entities/unit.json       |   7 +
 .../entities/unit_entries_en.json             |  18 +++
 .../dialogflow-agent/intents/Cancel.json      |  35 +++++
 .../intents/Cancel_usersays_en.json           |  38 +++++
 .../Convert Fahrenheit and Celsius.json       |  64 ++++++++
 ...rt Fahrenheit and Celsius_usersays_en.json | 139 ++++++++++++++++++
 .../intents/Convert Rankine and Kelvin.json   |  46 ++++++
 ...onvert Rankine and Kelvin_usersays_en.json |  58 ++++++++
 .../intents/Default Fallback Intent.json      |  28 ++++
 .../intents/Default Welcome Intent.json       |  32 ++++
 .../Default Welcome Intent_usersays_en.json   |  13 ++
 .../dialogflow-agent/package.json             |   3 +
 .../functions/package.json                    |   7 +-
 samples/quick-start/README.md                 |   7 +-
 ...ckstart-agent.zip => dialogflow-agent.zip} | Bin
 .../quick-start/dialogflow-agent/agent.json   |  37 +++++
 .../intents/Default Fallback Intent.json      |  41 ++++++
 .../intents/Default Welcome Intent.json       |  37 +++++
 .../quick-start/dialogflow-agent/package.json |   3 +
 samples/quick-start/functions/index.js        |   3 +-
 samples/quick-start/functions/package.json    |   7 +-
 48 files changed, 1060 insertions(+), 45 deletions(-)
 delete mode 100644 samples/actions-on-google/actions-on-google-agent.zip
 create mode 100644 samples/actions-on-google/dialogflow-agent.zip
 create mode 100755 samples/actions-on-google/dialogflow-agent/agent.json
 create mode 100755 samples/actions-on-google/dialogflow-agent/intents/Action on Google List Select.json
 create mode 100755 samples/actions-on-google/dialogflow-agent/intents/Default Fallback Intent.json
 create mode 100755 samples/actions-on-google/dialogflow-agent/intents/Default Welcome Intent.json
 create mode 100755 samples/actions-on-google/dialogflow-agent/intents/Other Intent.json
 create mode 100755 samples/actions-on-google/dialogflow-agent/intents/Other Intent_usersays_en.json
 create mode 100755 samples/actions-on-google/dialogflow-agent/package.json
 rename samples/multi-lang-and-locale/{multilocale-agent.zip => dialogflow-agent.zip} (100%)
 create mode 100755 samples/multi-lang-and-locale/dialogflow-agent/agent.json
 create mode 100755 samples/multi-lang-and-locale/dialogflow-agent/intents/Default Fallback Intent.json
 create mode 100755 samples/multi-lang-and-locale/dialogflow-agent/intents/Default Welcome Intent.json
 create mode 100755 samples/multi-lang-and-locale/dialogflow-agent/intents/Default Welcome Intent_usersays_en.json
 create mode 100755 samples/multi-lang-and-locale/dialogflow-agent/intents/Default Welcome Intent_usersays_fr.json
 create mode 100755 samples/multi-lang-and-locale/dialogflow-agent/package.json
 rename samples/parameters-contexts-and-rich-responses/{temperature-converter-agent.zip => dialogflow-agent.zip} (100%)
 create mode 100755 samples/parameters-contexts-and-rich-responses/dialogflow-agent/agent.json
 create mode 100755 samples/parameters-contexts-and-rich-responses/dialogflow-agent/entities/absoluteTempUnit.json
 create mode 100755 samples/parameters-contexts-and-rich-responses/dialogflow-agent/entities/absoluteTempUnit_entries_en.json
 create mode 100755 samples/parameters-contexts-and-rich-responses/dialogflow-agent/entities/unit.json
 create mode 100755 samples/parameters-contexts-and-rich-responses/dialogflow-agent/entities/unit_entries_en.json
 create mode 100755 samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Cancel.json
 create mode 100755 samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Cancel_usersays_en.json
 create mode 100755 samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Convert Fahrenheit and Celsius.json
 create mode 100755 samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Convert Fahrenheit and Celsius_usersays_en.json
 create mode 100755 samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Convert Rankine and Kelvin.json
 create mode 100755 samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Convert Rankine and Kelvin_usersays_en.json
 create mode 100755 samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Default Fallback Intent.json
 create mode 100755 samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Default Welcome Intent.json
 create mode 100755 samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Default Welcome Intent_usersays_en.json
 create mode 100755 samples/parameters-contexts-and-rich-responses/dialogflow-agent/package.json
 rename samples/quick-start/{quickstart-agent.zip => dialogflow-agent.zip} (100%)
 create mode 100755 samples/quick-start/dialogflow-agent/agent.json
 create mode 100755 samples/quick-start/dialogflow-agent/intents/Default Fallback Intent.json
 create mode 100755 samples/quick-start/dialogflow-agent/intents/Default Welcome Intent.json
 create mode 100755 samples/quick-start/dialogflow-agent/package.json

diff --git a/docs/WebhookClient.md b/docs/WebhookClient.md
index f73ec39..14f1c9d 100644
--- a/docs/WebhookClient.md
+++ b/docs/WebhookClient.md
@@ -19,9 +19,10 @@ Dialogflow's simulator
     * [.query](#WebhookClient+query) : <code>string</code>
     * [.locale](#WebhookClient+locale) : <code>string</code>
     * [.session](#WebhookClient+session) : <code>string</code>
-    * [.add(response)](#WebhookClient+add)
+    * [.consoleMessages](#WebhookClient+consoleMessages) : [<code>Array.&lt;RichResponse&gt;</code>](#RichResponse)
+    * [.add(responses)](#WebhookClient+add)
+    * [.addResponse_(response)](#WebhookClient+addResponse_)
     * [.handleRequest(handler)](#WebhookClient+handleRequest) ⇒ <code>Promise</code>
-    * [.getConsoleMessages()](#WebhookClient+getConsoleMessages) ⇒ <code>Array.&lt;RichResponses&gt;</code>
     * [.setContext(context)](#WebhookClient+setContext) ⇒ [<code>WebhookClient</code>](#WebhookClient)
     * [.clearOutgoingContexts()](#WebhookClient+clearOutgoingContexts) ⇒ [<code>WebhookClient</code>](#WebhookClient)
     * [.clearContext(context)](#WebhookClient+clearContext) ⇒ [<code>WebhookClient</code>](#WebhookClient)
@@ -109,10 +110,28 @@ Dialogflow input contexts included in the request or null if no value
 Dialogflow v2 API only
 https://dialogflow.com/docs/reference/api-v2/rest/v2beta1/WebhookRequest#FIELDS.session
 
+**Kind**: instance property of [<code>WebhookClient</code>](#WebhookClient)  
+<a name="WebhookClient+consoleMessages"></a>
+
+### webhookClient.consoleMessages : [<code>Array.&lt;RichResponse&gt;</code>](#RichResponse)
+List of messages defined in Dialogflow's console for the matched intent
+https://dialogflow.com/docs/rich-messages
+
 **Kind**: instance property of [<code>WebhookClient</code>](#WebhookClient)  
 <a name="WebhookClient+add"></a>
 
-### webhookClient.add(response)
+### webhookClient.add(responses)
+Add a response or list of responses to be sent to Dialogflow
+
+**Kind**: instance method of [<code>WebhookClient</code>](#WebhookClient)  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| responses | [<code>RichResponse</code>](#RichResponse) \| <code>string</code> \| [<code>Array.&lt;RichResponse&gt;</code>](#RichResponse) \| <code>Array.&lt;string&gt;</code> | (list) or single responses |
+
+<a name="WebhookClient+addResponse_"></a>
+
+### webhookClient.addResponse_(response)
 Add a response to be sent to Dialogflow
 
 **Kind**: instance method of [<code>WebhookClient</code>](#WebhookClient)  
@@ -133,14 +152,6 @@ Each handler must be a function callback.
 | --- | --- | --- |
 | handler | <code>Map</code> \| <code>requestCallback</code> | map of Dialogflow action name to handler function or     function to handle all requests (regardless of Dialogflow action). |
 
-<a name="WebhookClient+getConsoleMessages"></a>
-
-### webhookClient.getConsoleMessages() ⇒ <code>Array.&lt;RichResponses&gt;</code>
-Get a list of responses defined in Dialogflow's console
-for the matched intent
-https://dialogflow.com/docs/rich-messages
-
-**Kind**: instance method of [<code>WebhookClient</code>](#WebhookClient)  
 <a name="WebhookClient+setContext"></a>
 
 ### webhookClient.setContext(context) ⇒ [<code>WebhookClient</code>](#WebhookClient)
diff --git a/package.json b/package.json
index f9ccea0..c697eba 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "dialogflow-fulfillment",
   "description": "Dialogflow Fulfillment Library for Node.js",
   "main": "src/dialogflow-fulfillment.js",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "license": "Apache-2.0",
   "author": "Google Inc.",
   "directories": {
@@ -37,11 +37,10 @@
     "fulfillment"
   ],
   "dependencies": {
-    "actions-on-google": "^2.1.2",
     "debug": "^3.1.0"
   },
   "peerDependencies": {
-    "actions-on-google": "^2.0.1"
+    "actions-on-google": "^2.1.3"
   },
   "devDependencies": {
     "ava": "^0.24.0",
diff --git a/samples/actions-on-google/README.md b/samples/actions-on-google/README.md
index a7283bc..6ba362b 100644
--- a/samples/actions-on-google/README.md
+++ b/samples/actions-on-google/README.md
@@ -9,15 +9,16 @@ Click on the **Add to Dialogflow** button below and follow the prompts to create
 [![Dialogflow Fullfillment: Actions on Google](https://storage.googleapis.com/dialogflow-oneclick/deploy.svg "Dialogflow Fullfillment: Actions on Google")](https://console.dialogflow.com/api-client/oneclick?templateUrl=https%3A%2F%2Fstorage.googleapis.com%2Fdialogflow-oneclick%2Factions-on-google-agent.zip&agentName=ActionsOnGoogleSample)
 
 ### Option 2: Dialogflow Inline Editor
-1. [Sign up for or sign into Dialogflow](https://console.dialogflow.com/api-client/#/login)
-1. Create a Dialogflow agent
+1. [Sign up for or sign into Dialogflow](https://console.dialogflow.com/api-client/#/login) and [create a agent](https://dialogflow.com/docs/agents#create_an_agent)
+1. Go to your agent's settings and [Restore from zip](https://dialogflow.com/docs/agents#export_and_import) using the `dialogflow-agent.zip` in this directory (Note: this will overwrite your existing agent)
 1. [Enable the Cloud Function for Firebase inline editor](https://dialogflow.com/docs/fulfillment#cloud_functions_for_firebase)
 1. Copy this code in `functions/index.js` the `index.js` file in the Dialogflow Cloud Function for Firebase inline editor.
-1. Add `"dialogflow-fulfillment": "^0.4.0"` and `"actions-on-google": "^2.1.2"` to the `package.json` file's `dependencies` object in the Dialogflow Cloud Function for Firebase inline editor.
+1. Add `"dialogflow-fulfillment": "^0.4.1"` and `"actions-on-google": "^2.1.3"` to the `package.json` file's `dependencies` object in the Dialogflow Cloud Function for Firebase inline editor.
 1. Click `Deploy`
 
 ### Option 3: Firebase CLI
-1. Create a Dialogflow agent
+1. [Sign up for or sign into Dialogflow](https://console.dialogflow.com/api-client/#/login) and [create a agent](https://dialogflow.com/docs/agents#create_an_agent)
+1. Go to your agent's settings and [Restore from zip](https://dialogflow.com/docs/agents#export_and_import) using the `dialogflow-agent.zip` in this directory (Note: this will overwrite your existing agent)
 1. `cd` to the `functions` directory
 1. Run `npm install`
 1. Install the Firebase CLI by running `npm install -g firebase-tools`
diff --git a/samples/actions-on-google/actions-on-google-agent.zip b/samples/actions-on-google/actions-on-google-agent.zip
deleted file mode 100644
index f6448574b50d9ad36b6b24f82d41d581e0a16ff6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4023
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
Ge*GJtdzk?M

diff --git a/samples/actions-on-google/dialogflow-agent.zip b/samples/actions-on-google/dialogflow-agent.zip
new file mode 100644
index 0000000000000000000000000000000000000000..6980265176124f699f274c0ba09a92397f3f0cf0
GIT binary patch
literal 8257
zcmdT|c_7ql7aqIOVu);)WY02WOR|lvl&-PFP>gNt8KGn=!-U9k>vkz?kv&C1i?Wt2
z30boaLdITH=$lFOOVgzL{nMRchChDKdC&7c=e*~A;D@NF89>BWnsKG>=RdxDFo7T-
zTSqGww7s1R+DpR99_8vOc?7W;bjP3dXs93SQ3Tcy2`4<x0-`6p*FVll>T#&1A=1zj
z?T#Yiqylj8vC0hPYLIiil>roS5)$(aJ(l2UY6~^l?SZj;o#`{jcn;%K&hj!97|i)g
z`Dxjmx@2cB3=;2+*;YzX4T+%gsbS}4?zE0?Yqt)$pA!?O_42WCNa3l_w>RA1B9O<&
zs|2wSb^2*qm)jj9cW&*(E~t0TmNjEsuSY!Jrs$t>q9C2BTa#;+S@DKU=ZnOxp4*;j
z)G7F}d&&PPGVGuiQlw%U`q&CG)VZu$)%+ewKV5+^s}K952$QVQ<-D|axPGt2rle!k
z7Z)nrF8C%AvEE4YRthUnzz@;U%fg(?+X<vnvx7iHzE<egHu;urFo7>5@-R$8&k(Uj
zGm+|5nn^!Kq<QVJA8r>AhxB#{lEr}{f4FltmaI1Rme!V2hjopo7>z^W0hH0~RKgH0
ziaahz&;qMkJ;<=1w={rCAs9;yyTU4EK0>5{j($^Use&AVmeYjauQI|!eoG4%DH(m%
zBGkzP?Ml>9E`g-{o)w~w8<`t+NkRNxn@F9>1%u0EA9_<3Tmef^?UGFRb67kfK`g)F
z@}O-%|6`A3dVzEMC-FMjCCaKh{@~H(EO9rYvF1wHq5UF;R@O3{lfea2z@1j3VdrK?
zr3l}0w&5I`_SPpj=nyo(r!lg1#OI*f$)_T*n}Rau2dUb5Z`fm0x2GL5h8)=1HM-qw
zXhAY7O;Y-AZxOMe-6L{{bBbd+T(V(x#+h5ZjM}f1RGpREdu_a$HSN`q`cr4y<>fn7
zJN!#$E>W6wUz6z`kPuzy(76~P9bajmo+7~W+FnPALp1b6>>!TXDwSn!2Aj}FO%Z})
zf4Tb!u4Y7b*~dp*0_;#N1m=rO`R8FtOtWInu<efO?dUY{go?ijE`1vtThx(#<#TNV
zAKgF94!FO^%P-}PM4lOqvXI&JO8Qpw`yuyYIRh9C2L}Vz7h26iDJDNZ;+GWn@kJqc
ztaQ)THf-FXu1eTsRP^FG7S=SHLJEhIJLY@@BKNikiDy&_7bbjQ=HA6#-yvyuG?{6)
zgjY~U*!zBE&AT#(D@3uiNsP32qb|SdFWroT<|W4Iz4>^HA64Ayef*<dxK%QEGuyrX
zXP4RIFi*2P2W@pbs`0(I)f;Etb?X$=-LV(X!EE*mb(0Xzf6&KV{o&J0``EqCvG*;H
z{A=rL-AWsqx$w_)X7=O<LQdU^GQv~E7*gds?7jBDuG>fadL(bmvx#_#XL238y5ePP
z?ZCK&k<^<D_p{n*T4tBorg<(L7(QvkJ2+lja6Q2-Xa9?`Ix(U^E4?zO4p4$XuGHiN
zD)f`W`LR}iTshNxytLD|q#!hZXs8D!>qbX%sJR5CVVQP9uf`{3#~|R*m$FO{R}p{5
znq0gRQwz^PTUuH<9KUMo;FRcMZHtfB|2rwp>A0(9-+-OVc#gBnxI>z=wUhPrHx8DT
z$<9vJqfVm^eYUo?)|D%@SQik}5<;lM7P7U-O{x~%tZbYKIg+f#>|p~qT=bBHXhZ#T
z!+Zm{bc;-*416Gq=5qr`*^_&klMs;57RfXKk)QBOF8*)K@JcriTzBSjkYd=;)st}a
zdaNA^n%|wh>zk%5IT%fpoz+PfPhJz0iw*iXidW||{M!BzkBYT!dJ(BtF2z#SyTo$i
zc|Am0dYTn>Se7%Qzig`UW>I6~-9x^@%;jE1_<${LjCJ_Q_@2b&j&6v$VER0E##4c3
z_5tkTiGPGL`zo*~?|)KFg)|fMnAmJO8P7aBNH4>qcH3;{l^{`F@SrKbgNss*Hcr{W
zITTlZdYUc4zBl}UcyX-*9h0|OHFTK^?AFu((Y@C$l$E3A=t<9e@(2!}W|~+?yE9p>
z?^2yyirMZrv;6IwECM}TI?gvouy7aOEPq6|1U1r?)Y#rQci{m;G9p1Pd{O6J!vzYA
z!El%gX9d{4%ejm)x#dt>3b)mXtoe|vZca3G4Cgj58Fo#oaP!e_yk4&SiDt1m$K0&^
zCdB!pw<2i!!#%0q*T%k$q3S6~;ZNfDn7O$j)j*m@|IO6pTGKogrPy3*)x^bFfk?Eg
zivN{|C4V}`P1${-Bes<8%O}_mQ-DBKgtqeIQGk!E<k!pL`?Gz$98@=i2SxsZGJfOA
zTA6Rwb0ANyB=kHTQ0`v}0eR8`<?dnS?SVwOk}L|j$UKG$sm+@6e&?o-X$;f~c}@s>
zZsIUHnikx$>pbPTrnBgA#URMj=59v^?7}!d_JV~4w#B$NLMAy{NkpwTljk@*x$Io4
zDQL&w=;Ty&v2XD8$awYGp7>_FGmU)K)(4N7pF@jDm@w?thi*~0Y1Cgdo+n@VR{MDy
zR`;nXjcbpAt3!5=#YY*z9GUx*4V~?UHI6t&qP$?R`sElxHyt3`QDGaD!!NP&pA&@W
zMg>7q1m=G!ql2U%!Sjm@;d>9nQVN>#YmK#J9ZAay3VKda)n2XAsU7;sqKj9(!m|H$
ziSJ}ZMR0UR|BFOT!P|Z@aGsdCdtrCt?M~EO5@^seZRED)li=<AaJtHDisKd{Xs09t
ztUvWO&t1dDImpE2Qv;G_PgNdM?zY@_Q=EDbv{OSt7(C_n9HQH4xy?w3+K7H}%7LRL
zlB10!(7R6pQ3uU-dK0#j5}mL^s3Z59?bv`YHR}?tkSb#gZe503^pdQF-L@F`s5BO5
zD^lR-zpbKJQ`yHm$#H*zV}aw;aDmb^GFjCv_wJ)a@u|0A_I@qH8cs^`2J+YDQNFJ1
z;pvewa~@4f5~GG!*)C;<U$i$if4%=$dRY;Fv*I4y4x$oKFJsRBL1=U$Um6|hqLlj=
zN+h`*|2g$3l2aed#?uk)%1ij!k4D?Opm=p1Jv@00Q7$MOPm<{$H!wd`p$74ryoG2m
z5xZGfwICG87aI1GF4Lf}CQaF=Cip>wS?Z_m2hP@JyRm-t^*s~y-Cm4pqq^n+SK;ah
zD)f_@DBkX`87)4m!lV14hFa#Bz&1Y4OkA>LUNZc|m9SyvMgNM2veaIkVBH$H=sv;L
za*JJsX$wj2yXFKNZ0^j5BHUSHBKZa>0wxz;=?j>cYehb(Lh*%rPjtagz4fZ8Hg;Hw
zR)5E65$#d@>P=zqZc$r9EssChE?@KBm!#Okc7#^Y{wQ_7w2$iGmVfF>^}RzwbdtQy
zm~Ld3K6c*%9oFKo1e;|9ymF_Y7sA$THz+vf%jD-|ipimGEx_zKiQRo>Pn$}B!7yXg
z^CHH1;RkJT29N!Vo|(j`YwvB<PUJ*KMZ`rPjL~w=0Y54$dK_NdS~XtMR@i}eM9CeM
z;CdcG*B>?_EMZ*#hHZbxvR&bVTvw*mz1Alq>=x-#BZD_;;pI{l)1&XF#$93s{+boN
zQ|jr@rJ*2_!Wgyak=u#;h(41w+tjuEd9V!#mt_qnh@Xdw++eG<LGk~x8vb*|Kx_lw
zSr@Bg&gxL2ZRO%(O}J~2n^z+Y%Un~WASLr++VPh{HE(42j_y2?nrJ3xhPNsT0rN16
zJ<)#GC>}O5>C7eHXneSi;>vuF(qkr>r(yw`VS{u6u|sX@^>-XkiMjdsYrJQ9?Y*}u
zu4+-<+_G@jj4ksVrx*k4ypeSZyKzPfZMd?MgV3`CdM<g3%ED_4=InaQsMmSDl1zDn
zPAS}4)l{IT3lky(Lva1;?k|M$5w~R(1)}e}o^Bl}k*7=89GIUPs3YFn%hADk6CF_V
zs6xzrYf*{<?tp&Tac)jMVH^0ho?vlV>d@ls^I_dwcS2PIqSZe+HhKOf<8mJ3RV{<K
z9^5M1cbldr;OO5UCL&Pcxv3rkeSOY8_gG{QNKrE`=Pocyn*M;FR`J}XC6Pv&w==%^
zJ#&{PRP~=i8Aq;<1P!GKWn2)nG<`w$uC1!`?NCAQ1@C2U?tOg7hS!E?IcX1j`p&+3
z{^^oBG~#A?AGe<UODWX^lc~||>4i;*nwzilWtEte8}01tm(!zUdSX8<)VAN1et7X<
zjl%7q>*Mo9$le!CP1$t!<?bmiQ4vptAdcCwctT-_lf6-^ZLlzYMH#<+O{~8O@{=V2
ziu_U@tA6b2o$$BMbG=PW^!L{MODJ-E8(7V6)o=c7^P`|-rTUSNzL_wNe}1Wz!ieAN
zlO){i>DOF!_#q<HSCba#9&>`eLZxC<NkIX8TKYAIeFc-WfeZ#<F2T@*>Rj87)nyTH
znB*XU%UXh^0U>^v>Q~IKsRA8gLBO(7F%x7lzj3G6XZ>~Z1p0Yg0C+qmm@uV&w^E>S
zN55t=1Gk5G#{@cOLIBWIj4%y=%J0yj$c^CxO)_o(J|4qNOJdRAx?vkzwg><=6%#^$
zT~h#wWs{HaBU|gMZt*ZrIuZ+CJ?>XEM{H>8xdyr?vVcY7F%QT=uAUPl4X>5LBN|@h
z6wU{TwgmG5lcQ*TChL{HUNx!!>{LwchOmF))vQnIYYhM$0(n4SJf?xLb>D6GYA!#q
z0)8A1SRODyyi`obrj3vYMgHs1z$>UIAT%D+OHkv6QvGt-+E{vWfEcM5o2|c|-cQ2;
zFBXb`aCnS4Bbk&oaD&)biduk}sTfP9jiva1g$Is|K!))cCuTA!uhu;2Tf@e(Rr@Ae
zZ<dW^`)?u>hd*GY@P8Be3@f?FfKhNIt@WLgIB@~Nfk$5e#%?<RoYefa0!o~};D=}k
TX9EbtMtBd=gFxDB#Q**W<7&}<

literal 0
HcmV?d00001

diff --git a/samples/actions-on-google/dialogflow-agent/agent.json b/samples/actions-on-google/dialogflow-agent/agent.json
new file mode 100755
index 0000000..bac80e8
--- /dev/null
+++ b/samples/actions-on-google/dialogflow-agent/agent.json
@@ -0,0 +1,42 @@
+{
+  "description": "",
+  "language": "en",
+  "disableInteractionLogs": false,
+  "disableStackdriverLogs": true,
+  "googleAssistant": {
+    "googleAssistantCompatible": true,
+    "project": "libsample-advanced",
+    "welcomeIntentSignInRequired": false,
+    "startIntents": [],
+    "systemIntents": [],
+    "endIntentIds": [
+      "736b2be9-7526-4f76-91ca-e16f46ea2cca",
+      "6e9eae14-ec0e-4925-8506-96adab96eee4"
+    ],
+    "oAuthLinking": {
+      "required": false,
+      "grantType": "AUTH_CODE_GRANT"
+    },
+    "voiceType": "MALE_1",
+    "capabilities": [],
+    "protocolVersion": "V2",
+    "autoPreviewEnabled": true,
+    "isDeviceAgent": false
+  },
+  "defaultTimezone": "America/Los_Angeles",
+  "webhook": {
+    "url": "https://us-central1-actionsontransactions.cloudfunctions.net/dialogflowFirebaseFulfillment",
+    "headers": {
+      "": ""
+    },
+    "available": true,
+    "useForDomains": false,
+    "cloudFunctionsEnabled": true,
+    "cloudFunctionsInitialized": true
+  },
+  "isPrivate": true,
+  "customClassifierMode": "use.after",
+  "mlMinConfidence": 0.3,
+  "supportedLanguages": [],
+  "onePlatformApiVersion": "v2"
+}
\ No newline at end of file
diff --git a/samples/actions-on-google/dialogflow-agent/intents/Action on Google List Select.json b/samples/actions-on-google/dialogflow-agent/intents/Action on Google List Select.json
new file mode 100755
index 0000000..b744553
--- /dev/null
+++ b/samples/actions-on-google/dialogflow-agent/intents/Action on Google List Select.json	
@@ -0,0 +1,35 @@
+{
+  "id": "6e9eae14-ec0e-4925-8506-96adab96eee4",
+  "name": "Action on Google List Select",
+  "auto": true,
+  "contexts": [],
+  "responses": [
+    {
+      "resetContexts": false,
+      "affectedContexts": [],
+      "parameters": [],
+      "messages": [
+        {
+          "type": "simple_response",
+          "platform": "google",
+          "lang": "en",
+          "textToSpeech": "You selected an item from a list or carousel with the key \"#actions_intent_OPTION.OPTION\""
+        }
+      ],
+      "defaultResponsePlatforms": {
+        "google": false
+      },
+      "speech": []
+    }
+  ],
+  "priority": 500000,
+  "webhookUsed": false,
+  "webhookForSlotFilling": false,
+  "lastUpdate": 1528133199,
+  "fallbackIntent": false,
+  "events": [
+    {
+      "name": "actions_intent_OPTION"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/samples/actions-on-google/dialogflow-agent/intents/Default Fallback Intent.json b/samples/actions-on-google/dialogflow-agent/intents/Default Fallback Intent.json
new file mode 100755
index 0000000..e13f35e
--- /dev/null
+++ b/samples/actions-on-google/dialogflow-agent/intents/Default Fallback Intent.json	
@@ -0,0 +1,41 @@
+{
+  "id": "a574dd15-59da-46e7-a17f-a621902a5bc7",
+  "name": "Default Fallback Intent",
+  "auto": true,
+  "contexts": [],
+  "responses": [
+    {
+      "resetContexts": false,
+      "action": "input.unknown",
+      "affectedContexts": [],
+      "parameters": [],
+      "messages": [
+        {
+          "type": 0,
+          "lang": "en",
+          "speech": [
+            "I didn\u0027t get that. Can you say it again?",
+            "I missed what you said. Say it again?",
+            "Sorry, could you say that again?",
+            "Sorry, can you say that again?",
+            "Can you say that again?",
+            "Sorry, I didn\u0027t get that.",
+            "Sorry, what was that?",
+            "One more time?",
+            "What was that?",
+            "Say that again?",
+            "I didn\u0027t get that.",
+            "I missed that."
+          ]
+        }
+      ],
+      "defaultResponsePlatforms": {},
+      "speech": []
+    }
+  ],
+  "priority": 500000,
+  "webhookUsed": false,
+  "webhookForSlotFilling": false,
+  "fallbackIntent": true,
+  "events": []
+}
\ No newline at end of file
diff --git a/samples/actions-on-google/dialogflow-agent/intents/Default Welcome Intent.json b/samples/actions-on-google/dialogflow-agent/intents/Default Welcome Intent.json
new file mode 100755
index 0000000..bf142c5
--- /dev/null
+++ b/samples/actions-on-google/dialogflow-agent/intents/Default Welcome Intent.json	
@@ -0,0 +1,37 @@
+{
+  "id": "d4299d80-7da4-4fd2-a7b7-477ffb7a5df9",
+  "name": "Default Welcome Intent",
+  "auto": true,
+  "contexts": [],
+  "responses": [
+    {
+      "resetContexts": false,
+      "action": "input.welcome",
+      "affectedContexts": [],
+      "parameters": [],
+      "messages": [
+        {
+          "type": 0,
+          "lang": "en",
+          "speech": [
+            "Hi!",
+            "Hello!",
+            "Good day!",
+            "Greetings!"
+          ]
+        }
+      ],
+      "defaultResponsePlatforms": {},
+      "speech": []
+    }
+  ],
+  "priority": 500000,
+  "webhookUsed": false,
+  "webhookForSlotFilling": false,
+  "fallbackIntent": false,
+  "events": [
+    {
+      "name": "WELCOME"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/samples/actions-on-google/dialogflow-agent/intents/Other Intent.json b/samples/actions-on-google/dialogflow-agent/intents/Other Intent.json
new file mode 100755
index 0000000..3ff92eb
--- /dev/null
+++ b/samples/actions-on-google/dialogflow-agent/intents/Other Intent.json	
@@ -0,0 +1,28 @@
+{
+  "id": "8ea5901d-817c-4514-8d00-5f8619e4f26e",
+  "name": "Other Intent",
+  "auto": true,
+  "contexts": [],
+  "responses": [
+    {
+      "resetContexts": false,
+      "affectedContexts": [],
+      "parameters": [],
+      "messages": [
+        {
+          "type": 0,
+          "lang": "en",
+          "speech": []
+        }
+      ],
+      "defaultResponsePlatforms": {},
+      "speech": []
+    }
+  ],
+  "priority": 500000,
+  "webhookUsed": true,
+  "webhookForSlotFilling": false,
+  "lastUpdate": 1528132560,
+  "fallbackIntent": false,
+  "events": []
+}
\ No newline at end of file
diff --git a/samples/actions-on-google/dialogflow-agent/intents/Other Intent_usersays_en.json b/samples/actions-on-google/dialogflow-agent/intents/Other Intent_usersays_en.json
new file mode 100755
index 0000000..ec6bf0f
--- /dev/null
+++ b/samples/actions-on-google/dialogflow-agent/intents/Other Intent_usersays_en.json	
@@ -0,0 +1,14 @@
+[
+  {
+    "id": "262b5c54-aed4-4ad1-8a6f-424cf0c644df",
+    "data": [
+      {
+        "text": "other intent",
+        "userDefined": false
+      }
+    ],
+    "isTemplate": false,
+    "count": 0,
+    "updated": 1528132560
+  }
+]
\ No newline at end of file
diff --git a/samples/actions-on-google/dialogflow-agent/package.json b/samples/actions-on-google/dialogflow-agent/package.json
new file mode 100755
index 0000000..688e939
--- /dev/null
+++ b/samples/actions-on-google/dialogflow-agent/package.json
@@ -0,0 +1,3 @@
+{
+  "version": "1.0.0"
+}
\ No newline at end of file
diff --git a/samples/actions-on-google/functions/package.json b/samples/actions-on-google/functions/package.json
index c400145..60339f8 100644
--- a/samples/actions-on-google/functions/package.json
+++ b/samples/actions-on-google/functions/package.json
@@ -13,9 +13,9 @@
     "deploy": "firebase deploy --only functions:dialogflowFirebaseFulfillment"
   },
   "dependencies": {
-    "firebase-admin": "^4.2.1",
-    "firebase-functions": "^0.5.7",
-    "dialogflow-fulfillment": "^0.4.0",
-    "actions-on-google": "^2.1.2"
+    "firebase-admin": "^5.12.1",
+    "firebase-functions": "^1.0.3",
+    "actions-on-google": "^2.1.3",
+    "dialogflow-fulfillment": "0.4.1"
   }
-}
\ No newline at end of file
+}
diff --git a/samples/multi-lang-and-locale/README.md b/samples/multi-lang-and-locale/README.md
index fbbdaab..859f2ff 100644
--- a/samples/multi-lang-and-locale/README.md
+++ b/samples/multi-lang-and-locale/README.md
@@ -9,8 +9,8 @@ Click on the **Add to Dialogflow** button below and follow the prompts to create
 [![Multi-locale](https://storage.googleapis.com/dialogflow-oneclick/deploy.svg "Multi-locale")](https://console.dialogflow.com/api-client/oneclick?templateUrl=https%3A%2F%2Fstorage.googleapis.com%2Fdialogflow-oneclick%2Fmultilocale-agent.zip&agentName=MultilocaleSample)
 
 ### Option 2: Dialogflow Inline Editor
-1. [Sign up for or sign into Dialogflow](https://console.dialogflow.com/api-client/#/login)
-1. Create a Dialogflow agent
+1. [Sign up for or sign into Dialogflow](https://console.dialogflow.com/api-client/#/login) and [create a agent](https://dialogflow.com/docs/agents#create_an_agent)
+1. Go to your agent's settings and [Restore from zip](https://dialogflow.com/docs/agents#export_and_import) using the `dialogflow-agent.zip` in this directory (Note: this will overwrite your existing agent)
 1. [Enable the Cloud Function for Firebase inline editor](https://dialogflow.com/docs/fulfillment#cloud_functions_for_firebase)
 1. Change the name of the function in `functions/index.js` from `dialogflowFulfillmentMultiLocale` to `dialogflowFirebaseFulfillment`
 1. Copy this code in `functions/index.js` the `index.js` file in the Dialogflow Cloud Function for Firebase inline editor.
@@ -18,8 +18,8 @@ Click on the **Add to Dialogflow** button below and follow the prompts to create
 1. Click `Deploy`
 
 ### Option 3: Firebase CLI
-1. Create a Dialogflow agent
-1. Go to your agent's settings and [Restore from zip](https://dialogflow.com/docs/agents#export_and_import) using the `multilocaleAgent.zip` in this directory (Note: this will overwrite your existing agent)
+1. [Sign up for or sign into Dialogflow](https://console.dialogflow.com/api-client/#/login) and [create a agent](https://dialogflow.com/docs/agents#create_an_agent)
+1. Go to your agent's settings and [Restore from zip](https://dialogflow.com/docs/agents#export_and_import) using the `dialogflow-agent.zip` in this directory (Note: this will overwrite your existing agent)
 1. `cd` to the `functions` directory
 1. Run `npm install`
 1. Install the Firebase CLI by running `npm install -g firebase-tools`
diff --git a/samples/multi-lang-and-locale/multilocale-agent.zip b/samples/multi-lang-and-locale/dialogflow-agent.zip
similarity index 100%
rename from samples/multi-lang-and-locale/multilocale-agent.zip
rename to samples/multi-lang-and-locale/dialogflow-agent.zip
diff --git a/samples/multi-lang-and-locale/dialogflow-agent/agent.json b/samples/multi-lang-and-locale/dialogflow-agent/agent.json
new file mode 100755
index 0000000..4591d5f
--- /dev/null
+++ b/samples/multi-lang-and-locale/dialogflow-agent/agent.json
@@ -0,0 +1,39 @@
+{
+  "description": "",
+  "language": "en",
+  "disableInteractionLogs": false,
+  "googleAssistant": {
+    "googleAssistantCompatible": true,
+    "project": "libsample-multilangandlocale",
+    "welcomeIntentSignInRequired": false,
+    "startIntents": [],
+    "systemIntents": [],
+    "endIntentIds": [],
+    "oAuthLinking": {
+      "required": false,
+      "grantType": "AUTH_CODE_GRANT"
+    },
+    "voiceType": "MALE_1",
+    "capabilities": [],
+    "protocolVersion": "V2",
+    "autoPreviewEnabled": true
+  },
+  "defaultTimezone": "America/Los_Angeles",
+  "webhook": {
+    "url": "https://us-central1-libsample-advanced.cloudfunctions.net/dialogflowFirebaseFulfillment",
+    "headers": {
+      "": ""
+    },
+    "available": true,
+    "useForDomains": false,
+    "cloudFunctionsEnabled": true,
+    "cloudFunctionsInitialized": true
+  },
+  "isPrivate": true,
+  "customClassifierMode": "use.after",
+  "mlMinConfidence": 0.3,
+  "supportedLanguages": [
+    "fr"
+  ],
+  "onePlatformApiVersion": "v2"
+}
\ No newline at end of file
diff --git a/samples/multi-lang-and-locale/dialogflow-agent/intents/Default Fallback Intent.json b/samples/multi-lang-and-locale/dialogflow-agent/intents/Default Fallback Intent.json
new file mode 100755
index 0000000..9484bbe
--- /dev/null
+++ b/samples/multi-lang-and-locale/dialogflow-agent/intents/Default Fallback Intent.json	
@@ -0,0 +1,33 @@
+{
+  "id": "43ca31a7-53ac-4cdb-a3fa-305e14c48c3e",
+  "name": "Default Fallback Intent",
+  "auto": false,
+  "contexts": [],
+  "responses": [
+    {
+      "resetContexts": false,
+      "action": "input.unknown",
+      "affectedContexts": [],
+      "parameters": [],
+      "messages": [
+        {
+          "type": 0,
+          "lang": "fr",
+          "speech": "webhook a échoué"
+        },
+        {
+          "type": 0,
+          "lang": "en",
+          "speech": "Webhook Failed"
+        }
+      ],
+      "defaultResponsePlatforms": {},
+      "speech": []
+    }
+  ],
+  "priority": 500000,
+  "webhookUsed": true,
+  "webhookForSlotFilling": false,
+  "fallbackIntent": true,
+  "events": []
+}
\ No newline at end of file
diff --git a/samples/multi-lang-and-locale/dialogflow-agent/intents/Default Welcome Intent.json b/samples/multi-lang-and-locale/dialogflow-agent/intents/Default Welcome Intent.json
new file mode 100755
index 0000000..b4d117d
--- /dev/null
+++ b/samples/multi-lang-and-locale/dialogflow-agent/intents/Default Welcome Intent.json	
@@ -0,0 +1,37 @@
+{
+  "id": "2134273f-3417-4b8a-9f59-148572fd2e60",
+  "name": "Default Welcome Intent",
+  "auto": true,
+  "contexts": [],
+  "responses": [
+    {
+      "resetContexts": false,
+      "action": "input.welcome",
+      "affectedContexts": [],
+      "parameters": [],
+      "messages": [
+        {
+          "type": 0,
+          "lang": "fr",
+          "speech": "webhook a échoué"
+        },
+        {
+          "type": 0,
+          "lang": "en",
+          "speech": "Webhook Failed"
+        }
+      ],
+      "defaultResponsePlatforms": {},
+      "speech": []
+    }
+  ],
+  "priority": 500000,
+  "webhookUsed": true,
+  "webhookForSlotFilling": false,
+  "fallbackIntent": false,
+  "events": [
+    {
+      "name": "WELCOME"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/samples/multi-lang-and-locale/dialogflow-agent/intents/Default Welcome Intent_usersays_en.json b/samples/multi-lang-and-locale/dialogflow-agent/intents/Default Welcome Intent_usersays_en.json
new file mode 100755
index 0000000..5bfd207
--- /dev/null
+++ b/samples/multi-lang-and-locale/dialogflow-agent/intents/Default Welcome Intent_usersays_en.json	
@@ -0,0 +1,13 @@
+[
+  {
+    "id": "79cef82e-4889-431e-94fa-87e18aa57c52",
+    "data": [
+      {
+        "text": "hi",
+        "userDefined": false
+      }
+    ],
+    "isTemplate": false,
+    "count": 0
+  }
+]
\ No newline at end of file
diff --git a/samples/multi-lang-and-locale/dialogflow-agent/intents/Default Welcome Intent_usersays_fr.json b/samples/multi-lang-and-locale/dialogflow-agent/intents/Default Welcome Intent_usersays_fr.json
new file mode 100755
index 0000000..dab3351
--- /dev/null
+++ b/samples/multi-lang-and-locale/dialogflow-agent/intents/Default Welcome Intent_usersays_fr.json	
@@ -0,0 +1,13 @@
+[
+  {
+    "id": "9834e31e-bc3d-407d-b0ed-68e4ce36716c",
+    "data": [
+      {
+        "text": "salut",
+        "userDefined": false
+      }
+    ],
+    "isTemplate": false,
+    "count": 0
+  }
+]
\ No newline at end of file
diff --git a/samples/multi-lang-and-locale/dialogflow-agent/package.json b/samples/multi-lang-and-locale/dialogflow-agent/package.json
new file mode 100755
index 0000000..688e939
--- /dev/null
+++ b/samples/multi-lang-and-locale/dialogflow-agent/package.json
@@ -0,0 +1,3 @@
+{
+  "version": "1.0.0"
+}
\ No newline at end of file
diff --git a/samples/multi-lang-and-locale/functions/package.json b/samples/multi-lang-and-locale/functions/package.json
index 9e0cc86..04ec488 100644
--- a/samples/multi-lang-and-locale/functions/package.json
+++ b/samples/multi-lang-and-locale/functions/package.json
@@ -13,8 +13,9 @@
     "deploy": "firebase deploy --only functions:dialogflowFirebaseFulfillment"
   },
   "dependencies": {
-    "firebase-admin": "^4.2.1",
-    "firebase-functions": "^0.5.7",
-    "dialogflow-fulfillment": "^0.4.0"
+    "firebase-admin": "^5.12.1",
+    "firebase-functions": "^1.0.3",
+    "dialogflow-fulfillment": "^0.4.1",
+    "actions-on-google": "^2.1.3"
   }
 }
\ No newline at end of file
diff --git a/samples/parameters-contexts-and-rich-responses/README.md b/samples/parameters-contexts-and-rich-responses/README.md
index 5f91851..42666a2 100644
--- a/samples/parameters-contexts-and-rich-responses/README.md
+++ b/samples/parameters-contexts-and-rich-responses/README.md
@@ -9,8 +9,8 @@ Click on the **Add to Dialogflow** button below and follow the prompts to create
 [![Temperature Trivia](https://storage.googleapis.com/dialogflow-oneclick/deploy.svg "Temperature Trivia")](https://console.dialogflow.com/api-client/oneclick?templateUrl=https%3A%2F%2Fstorage.googleapis.com%2Fdialogflow-oneclick%2Ftemperature-converter-agent.zip&agentName=TemperatureConverterSample)
 
 ### Option 2: Dialogflow Inline Editor
-1. [Sign up for or sign into Dialogflow](https://console.dialogflow.com/api-client/#/login)
-1. Create a Dialogflow agent
+1. [Sign up for or sign into Dialogflow](https://console.dialogflow.com/api-client/#/login) and [create a agent](https://dialogflow.com/docs/agents#create_an_agent)
+1. Go to your agent's settings and [Restore from zip](https://dialogflow.com/docs/agents#export_and_import) using the `dialogflow-agent.zip` in this directory (Note: this will overwrite your existing agent)
 1. [Enable the Cloud Function for Firebase inline editor](https://dialogflow.com/docs/fulfillment#cloud_functions_for_firebase)
 1. Change the name of the function in `functions/index.js` from `dialogflowFulfillmentLibAdvancedSample` to `dialogflowFirebaseFulfillment`
 1. Copy this code in `functions/index.js` the `index.js` file in the Dialogflow Cloud Function for Firebase inline editor.
@@ -19,8 +19,8 @@ Click on the **Add to Dialogflow** button below and follow the prompts to create
 
 ### Setup: Firebase CLI (option 2)
 
-1. Create a Dialogflow agent
-1. Go to your agent's settings and [Restore from zip](https://dialogflow.com/docs/agents#export_and_import) using the `advancedAgent.zip` in this directory (Note: this will overwrite your existing agent)
+1. [Sign up for or sign into Dialogflow](https://console.dialogflow.com/api-client/#/login) and [create a agent](https://dialogflow.com/docs/agents#create_an_agent)
+1. Go to your agent's settings and [Restore from zip](https://dialogflow.com/docs/agents#export_and_import) using the `dialogflow-agent.zip` in this directory (Note: this will overwrite your existing agent)
 1. `cd` to the `functions` directory
 1. Run `npm install`
 1. Install the Firebase CLI by running `npm install -g firebase-tools`
diff --git a/samples/parameters-contexts-and-rich-responses/temperature-converter-agent.zip b/samples/parameters-contexts-and-rich-responses/dialogflow-agent.zip
similarity index 100%
rename from samples/parameters-contexts-and-rich-responses/temperature-converter-agent.zip
rename to samples/parameters-contexts-and-rich-responses/dialogflow-agent.zip
diff --git a/samples/parameters-contexts-and-rich-responses/dialogflow-agent/agent.json b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/agent.json
new file mode 100755
index 0000000..186442b
--- /dev/null
+++ b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/agent.json
@@ -0,0 +1,39 @@
+{
+  "description": "",
+  "language": "en",
+  "disableInteractionLogs": false,
+  "googleAssistant": {
+    "googleAssistantCompatible": true,
+    "project": "libsample-advanced",
+    "welcomeIntentSignInRequired": false,
+    "startIntents": [],
+    "systemIntents": [],
+    "endIntentIds": [
+      "736b2be9-7526-4f76-91ca-e16f46ea2cca"
+    ],
+    "oAuthLinking": {
+      "required": false,
+      "grantType": "AUTH_CODE_GRANT"
+    },
+    "voiceType": "MALE_1",
+    "capabilities": [],
+    "protocolVersion": "V2",
+    "autoPreviewEnabled": true
+  },
+  "defaultTimezone": "America/Los_Angeles",
+  "webhook": {
+    "url": "https://us-central1-libsample-advanced.cloudfunctions.net/dialogflowFirebaseFulfillment",
+    "headers": {
+      "": ""
+    },
+    "available": true,
+    "useForDomains": false,
+    "cloudFunctionsEnabled": true,
+    "cloudFunctionsInitialized": true
+  },
+  "isPrivate": true,
+  "customClassifierMode": "use.after",
+  "mlMinConfidence": 0.3,
+  "supportedLanguages": [],
+  "onePlatformApiVersion": "v2"
+}
\ No newline at end of file
diff --git a/samples/parameters-contexts-and-rich-responses/dialogflow-agent/entities/absoluteTempUnit.json b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/entities/absoluteTempUnit.json
new file mode 100755
index 0000000..32ada23
--- /dev/null
+++ b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/entities/absoluteTempUnit.json
@@ -0,0 +1,7 @@
+{
+  "id": "bced28ff-00a9-44bc-80f7-ca2ff085f636",
+  "name": "absoluteTempUnit",
+  "isOverridable": true,
+  "isEnum": false,
+  "automatedExpansion": false
+}
\ No newline at end of file
diff --git a/samples/parameters-contexts-and-rich-responses/dialogflow-agent/entities/absoluteTempUnit_entries_en.json b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/entities/absoluteTempUnit_entries_en.json
new file mode 100755
index 0000000..de7f662
--- /dev/null
+++ b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/entities/absoluteTempUnit_entries_en.json
@@ -0,0 +1,18 @@
+[
+  {
+    "value": "Kelvin",
+    "synonyms": [
+      "Kelvin",
+      "K",
+      "kelvin"
+    ]
+  },
+  {
+    "value": "Rankine",
+    "synonyms": [
+      "Rankine",
+      "R",
+      "rankine"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/samples/parameters-contexts-and-rich-responses/dialogflow-agent/entities/unit.json b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/entities/unit.json
new file mode 100755
index 0000000..d55cf74
--- /dev/null
+++ b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/entities/unit.json
@@ -0,0 +1,7 @@
+{
+  "id": "d2e0852d-a8fd-4d5b-a014-bf609dd9f445",
+  "name": "unit",
+  "isOverridable": true,
+  "isEnum": false,
+  "automatedExpansion": false
+}
\ No newline at end of file
diff --git a/samples/parameters-contexts-and-rich-responses/dialogflow-agent/entities/unit_entries_en.json b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/entities/unit_entries_en.json
new file mode 100755
index 0000000..181403e
--- /dev/null
+++ b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/entities/unit_entries_en.json
@@ -0,0 +1,18 @@
+[
+  {
+    "value": "Celsius",
+    "synonyms": [
+      "Celsius",
+      "C",
+      "celsius"
+    ]
+  },
+  {
+    "value": "Fahrenheit",
+    "synonyms": [
+      "Fahrenheit",
+      "F",
+      "fahrenheit"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Cancel.json b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Cancel.json
new file mode 100755
index 0000000..d722adc
--- /dev/null
+++ b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Cancel.json
@@ -0,0 +1,35 @@
+{
+  "id": "736b2be9-7526-4f76-91ca-e16f46ea2cca",
+  "name": "Cancel",
+  "auto": true,
+  "contexts": [],
+  "responses": [
+    {
+      "resetContexts": false,
+      "action": "cancel",
+      "affectedContexts": [
+        {
+          "name": "temperature",
+          "parameters": {},
+          "lifespan": 0
+        }
+      ],
+      "parameters": [],
+      "messages": [
+        {
+          "type": 0,
+          "lang": "en",
+          "speech": "Goodbye!"
+        }
+      ],
+      "defaultResponsePlatforms": {},
+      "speech": []
+    }
+  ],
+  "priority": 500000,
+  "webhookUsed": false,
+  "webhookForSlotFilling": false,
+  "lastUpdate": 1517002931,
+  "fallbackIntent": false,
+  "events": []
+}
\ No newline at end of file
diff --git a/samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Cancel_usersays_en.json b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Cancel_usersays_en.json
new file mode 100755
index 0000000..6c3c89d
--- /dev/null
+++ b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Cancel_usersays_en.json
@@ -0,0 +1,38 @@
+[
+  {
+    "id": "090fe506-4c96-4330-9664-477b518d718c",
+    "data": [
+      {
+        "text": "Exit",
+        "userDefined": false
+      }
+    ],
+    "isTemplate": false,
+    "count": 0,
+    "updated": 1517002931
+  },
+  {
+    "id": "0bea9d01-7206-4389-9e9d-d7db36cb53c1",
+    "data": [
+      {
+        "text": "Quit",
+        "userDefined": false
+      }
+    ],
+    "isTemplate": false,
+    "count": 0,
+    "updated": 1517002931
+  },
+  {
+    "id": "b36b3d02-3569-489b-a254-63fd8a950c3f",
+    "data": [
+      {
+        "text": "Cancel",
+        "userDefined": false
+      }
+    ],
+    "isTemplate": false,
+    "count": 0,
+    "updated": 1517002931
+  }
+]
\ No newline at end of file
diff --git a/samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Convert Fahrenheit and Celsius.json b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Convert Fahrenheit and Celsius.json
new file mode 100755
index 0000000..83048b1
--- /dev/null
+++ b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Convert Fahrenheit and Celsius.json	
@@ -0,0 +1,64 @@
+{
+  "id": "a7e72b1d-225b-47ec-95ff-8e7ca3a12138",
+  "name": "Convert Fahrenheit and Celsius",
+  "auto": true,
+  "contexts": [],
+  "responses": [
+    {
+      "resetContexts": false,
+      "action": "convert.common.temperature",
+      "affectedContexts": [
+        {
+          "name": "temperature",
+          "parameters": {},
+          "lifespan": 1
+        }
+      ],
+      "parameters": [
+        {
+          "id": "f0256fcd-8ef7-4de6-a027-060ff032d2f0",
+          "required": true,
+          "dataType": "@sys.number",
+          "name": "temperature",
+          "value": "$temperature",
+          "prompts": [
+            {
+              "lang": "en",
+              "value": "What temperature would you like to convert?"
+            }
+          ],
+          "isList": false
+        },
+        {
+          "id": "35303e91-1bb2-4bad-8b37-71dd34f7d54f",
+          "required": true,
+          "dataType": "@unit",
+          "name": "unit",
+          "value": "$unit",
+          "prompts": [
+            {
+              "lang": "en",
+              "value": "Fahrenheit or Celsius?"
+            }
+          ],
+          "isList": false
+        }
+      ],
+      "messages": [
+        {
+          "type": 0,
+          "lang": "en",
+          "speech": "Webhook Failed"
+        }
+      ],
+      "defaultResponsePlatforms": {},
+      "speech": []
+    }
+  ],
+  "priority": 500000,
+  "webhookUsed": true,
+  "webhookForSlotFilling": false,
+  "lastUpdate": 1517002171,
+  "fallbackIntent": false,
+  "events": []
+}
\ No newline at end of file
diff --git a/samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Convert Fahrenheit and Celsius_usersays_en.json b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Convert Fahrenheit and Celsius_usersays_en.json
new file mode 100755
index 0000000..ee6a017
--- /dev/null
+++ b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Convert Fahrenheit and Celsius_usersays_en.json	
@@ -0,0 +1,139 @@
+[
+  {
+    "id": "c103174e-530f-4bbc-8afc-08db0f438bee",
+    "data": [
+      {
+        "text": "27",
+        "alias": "temperature",
+        "meta": "@sys.number",
+        "userDefined": false
+      },
+      {
+        "text": "°",
+        "userDefined": false
+      }
+    ],
+    "isTemplate": false,
+    "count": 0
+  },
+  {
+    "id": "0ea802b7-5bcb-47b9-9c6e-c178ee32919f",
+    "data": [
+      {
+        "text": "30",
+        "alias": "temperature",
+        "meta": "@sys.number",
+        "userDefined": true
+      },
+      {
+        "text": " degrees",
+        "userDefined": false
+      }
+    ],
+    "isTemplate": false,
+    "count": 0
+  },
+  {
+    "id": "cc81c27c-c714-4d8d-9c00-42710b683b35",
+    "data": [
+      {
+        "text": "25",
+        "alias": "temperature",
+        "meta": "@sys.number",
+        "userDefined": false
+      }
+    ],
+    "isTemplate": false,
+    "count": 0
+  },
+  {
+    "id": "ad5f4fed-4f1f-479b-bf0e-e2eefed09d7c",
+    "data": [
+      {
+        "text": "How about ",
+        "userDefined": false
+      },
+      {
+        "text": "45",
+        "alias": "temperature",
+        "meta": "@sys.number",
+        "userDefined": true
+      },
+      {
+        "text": " degrees?",
+        "userDefined": false
+      }
+    ],
+    "isTemplate": false,
+    "count": 0
+  },
+  {
+    "id": "6354925c-bf9c-4a5a-93d5-a1599051c65e",
+    "data": [
+      {
+        "text": "27",
+        "alias": "temperature",
+        "meta": "@sys.number",
+        "userDefined": false
+      },
+      {
+        "text": "° ",
+        "userDefined": false
+      },
+      {
+        "text": "Celsius",
+        "alias": "unit",
+        "meta": "@unit",
+        "userDefined": true
+      }
+    ],
+    "isTemplate": false,
+    "count": 0
+  },
+  {
+    "id": "bd6fb6a7-bf35-409e-a2f3-dcc72b3bb696",
+    "data": [
+      {
+        "text": "-40",
+        "alias": "temperature",
+        "meta": "@sys.number",
+        "userDefined": true
+      },
+      {
+        "text": "° ",
+        "userDefined": false
+      },
+      {
+        "text": "Fahrenheit",
+        "alias": "unit",
+        "meta": "@unit",
+        "userDefined": true
+      }
+    ],
+    "isTemplate": false,
+    "count": 0
+  },
+  {
+    "id": "c76b7675-a35b-48bd-bb4a-227aa40a436b",
+    "data": [
+      {
+        "text": "45",
+        "alias": "temperature",
+        "meta": "@sys.number",
+        "userDefined": true
+      },
+      {
+        "text": " degrees ",
+        "userDefined": false
+      },
+      {
+        "text": "Celsius",
+        "alias": "unit",
+        "meta": "@unit",
+        "userDefined": true
+      }
+    ],
+    "isTemplate": false,
+    "count": 0
+  }
+]
\ No newline at end of file
diff --git a/samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Convert Rankine and Kelvin.json b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Convert Rankine and Kelvin.json
new file mode 100755
index 0000000..3991fc7
--- /dev/null
+++ b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Convert Rankine and Kelvin.json	
@@ -0,0 +1,46 @@
+{
+  "id": "78b4b898-d06d-461b-845b-1ee8dd5d6158",
+  "name": "Convert Rankine and Kelvin",
+  "auto": true,
+  "contexts": [
+    "temperature"
+  ],
+  "responses": [
+    {
+      "resetContexts": false,
+      "action": "convert.absolute.temperature",
+      "affectedContexts": [],
+      "parameters": [
+        {
+          "id": "be3f3214-fdcf-4e2b-b057-7b0ae133e01d",
+          "required": true,
+          "dataType": "@absoluteTempUnit",
+          "name": "absoluteTempUnit",
+          "value": "$absoluteTempUnit",
+          "prompts": [
+            {
+              "lang": "en",
+              "value": "Rankine or Kelvin?"
+            }
+          ],
+          "isList": false
+        }
+      ],
+      "messages": [
+        {
+          "type": 0,
+          "lang": "en",
+          "speech": "Webhook Failed"
+        }
+      ],
+      "defaultResponsePlatforms": {},
+      "speech": []
+    }
+  ],
+  "priority": 500000,
+  "webhookUsed": true,
+  "webhookForSlotFilling": false,
+  "lastUpdate": 1517002804,
+  "fallbackIntent": false,
+  "events": []
+}
\ No newline at end of file
diff --git a/samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Convert Rankine and Kelvin_usersays_en.json b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Convert Rankine and Kelvin_usersays_en.json
new file mode 100755
index 0000000..fed2084
--- /dev/null
+++ b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Convert Rankine and Kelvin_usersays_en.json	
@@ -0,0 +1,58 @@
+[
+  {
+    "id": "360a5438-1113-4a65-8697-281d6773da90",
+    "data": [
+      {
+        "text": "Kelvin",
+        "alias": "absoluteTempUnit",
+        "meta": "@absoluteTempUnit",
+        "userDefined": false
+      }
+    ],
+    "isTemplate": false,
+    "count": 0,
+    "updated": 1517002804
+  },
+  {
+    "id": "9e035726-eb5f-4a7d-a8e8-ca2e09e58c4f",
+    "data": [
+      {
+        "text": "Rankine",
+        "alias": "absoluteTempUnit",
+        "meta": "@absoluteTempUnit",
+        "userDefined": false
+      }
+    ],
+    "isTemplate": false,
+    "count": 0,
+    "updated": 1517002804
+  },
+  {
+    "id": "b18572f8-1921-463e-9751-1dddca9d907b",
+    "data": [
+      {
+        "text": "K",
+        "alias": "absoluteTempUnit",
+        "meta": "@absoluteTempUnit",
+        "userDefined": false
+      }
+    ],
+    "isTemplate": false,
+    "count": 0,
+    "updated": 1517002804
+  },
+  {
+    "id": "55e31bdf-a41a-4884-8264-6f8d4114a6d6",
+    "data": [
+      {
+        "text": "R",
+        "alias": "absoluteTempUnit",
+        "meta": "@absoluteTempUnit",
+        "userDefined": false
+      }
+    ],
+    "isTemplate": false,
+    "count": 2,
+    "updated": 1517002804
+  }
+]
\ No newline at end of file
diff --git a/samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Default Fallback Intent.json b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Default Fallback Intent.json
new file mode 100755
index 0000000..33385bb
--- /dev/null
+++ b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Default Fallback Intent.json	
@@ -0,0 +1,28 @@
+{
+  "id": "296423e9-f6b2-4483-81c1-4462ae455719",
+  "name": "Default Fallback Intent",
+  "auto": false,
+  "contexts": [],
+  "responses": [
+    {
+      "resetContexts": false,
+      "action": "input.unknown",
+      "affectedContexts": [],
+      "parameters": [],
+      "messages": [
+        {
+          "type": 0,
+          "lang": "en",
+          "speech": "Webhook Failed"
+        }
+      ],
+      "defaultResponsePlatforms": {},
+      "speech": []
+    }
+  ],
+  "priority": 500000,
+  "webhookUsed": true,
+  "webhookForSlotFilling": false,
+  "fallbackIntent": true,
+  "events": []
+}
\ No newline at end of file
diff --git a/samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Default Welcome Intent.json b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Default Welcome Intent.json
new file mode 100755
index 0000000..0838201
--- /dev/null
+++ b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Default Welcome Intent.json	
@@ -0,0 +1,32 @@
+{
+  "id": "37873ae7-a618-4462-a67d-8877e2128fa0",
+  "name": "Default Welcome Intent",
+  "auto": true,
+  "contexts": [],
+  "responses": [
+    {
+      "resetContexts": false,
+      "action": "input.welcome",
+      "affectedContexts": [],
+      "parameters": [],
+      "messages": [
+        {
+          "type": 0,
+          "lang": "en",
+          "speech": "Webhook Failed"
+        }
+      ],
+      "defaultResponsePlatforms": {},
+      "speech": []
+    }
+  ],
+  "priority": 500000,
+  "webhookUsed": true,
+  "webhookForSlotFilling": false,
+  "fallbackIntent": false,
+  "events": [
+    {
+      "name": "WELCOME"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Default Welcome Intent_usersays_en.json b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Default Welcome Intent_usersays_en.json
new file mode 100755
index 0000000..25d77d1
--- /dev/null
+++ b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/intents/Default Welcome Intent_usersays_en.json	
@@ -0,0 +1,13 @@
+[
+  {
+    "id": "759c6964-a552-40db-a12f-bf75a1ca99ff",
+    "data": [
+      {
+        "text": "hi",
+        "userDefined": false
+      }
+    ],
+    "isTemplate": false,
+    "count": 0
+  }
+]
\ No newline at end of file
diff --git a/samples/parameters-contexts-and-rich-responses/dialogflow-agent/package.json b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/package.json
new file mode 100755
index 0000000..688e939
--- /dev/null
+++ b/samples/parameters-contexts-and-rich-responses/dialogflow-agent/package.json
@@ -0,0 +1,3 @@
+{
+  "version": "1.0.0"
+}
\ No newline at end of file
diff --git a/samples/parameters-contexts-and-rich-responses/functions/package.json b/samples/parameters-contexts-and-rich-responses/functions/package.json
index 4e7d25e..1c740b3 100644
--- a/samples/parameters-contexts-and-rich-responses/functions/package.json
+++ b/samples/parameters-contexts-and-rich-responses/functions/package.json
@@ -13,8 +13,9 @@
     "deploy": "firebase deploy --only functions:dialogflowFirebaseFulfillment"
   },
   "dependencies": {
-    "firebase-admin": "^4.2.1",
-    "firebase-functions": "^0.5.7",
-    "dialogflow-fulfillment": "^0.4.0"
+    "firebase-admin": "^5.12.1",
+    "firebase-functions": "^1.0.3",
+    "dialogflow-fulfillment": "^0.4.1",
+    "actions-on-google": "^2.1.3"
   }
 }
\ No newline at end of file
diff --git a/samples/quick-start/README.md b/samples/quick-start/README.md
index 3b2dafc..cf361dd 100644
--- a/samples/quick-start/README.md
+++ b/samples/quick-start/README.md
@@ -9,15 +9,16 @@ Click on the **Add to Dialogflow** button below and follow the prompts to create
 [![Getting Started](https://storage.googleapis.com/dialogflow-oneclick/deploy.svg "Getting Started")](https://console.dialogflow.com/api-client/oneclick?templateUrl=https%3A%2F%2Fstorage.googleapis.com%2Fdialogflow-oneclick%2Fquickstart-agent.zip&agentName=QuickStartSample)
 
 ### Option 2: Dialogflow Inline Editor
-1. [Sign up for or sign into Dialogflow](https://console.dialogflow.com/api-client/#/login)
-1. Create a Dialogflow agent
+1. [Sign up for or sign into Dialogflow](https://console.dialogflow.com/api-client/#/login) and [create a agent](https://dialogflow.com/docs/agents#create_an_agent)
+1. Go to your agent's settings and [Restore from zip](https://dialogflow.com/docs/agents#export_and_import) using the `dialogflow-agent.zip` in this directory (Note: this will overwrite your existing agent)
 1. [Enable the Cloud Function for Firebase inline editor](https://dialogflow.com/docs/fulfillment#cloud_functions_for_firebase)
 1. Copy this code in `functions/index.js` the `index.js` file in the Dialogflow Cloud Function for Firebase inline editor.
 1. Add `"dialogflow-fulfillment": "^0.4.0"` to the `package.json` file's `dependencies` object in the Dialogflow Cloud Function for Firebase inline editor.
 1. Click `Deploy`
 
 ### Option 3: Firebase CLI
-1. Create a Dialogflow agent
+1. [Sign up for or sign into Dialogflow](https://console.dialogflow.com/api-client/#/login) and [create a agent](https://dialogflow.com/docs/agents#create_an_agent)
+1. Go to your agent's settings and [Restore from zip](https://dialogflow.com/docs/agents#export_and_import) using the `dialogflow-agent.zip` in this directory (Note: this will overwrite your existing agent)
 1. `cd` to the `functions` directory
 1. Run `npm install`
 1. Install the Firebase CLI by running `npm install -g firebase-tools`
diff --git a/samples/quick-start/quickstart-agent.zip b/samples/quick-start/dialogflow-agent.zip
similarity index 100%
rename from samples/quick-start/quickstart-agent.zip
rename to samples/quick-start/dialogflow-agent.zip
diff --git a/samples/quick-start/dialogflow-agent/agent.json b/samples/quick-start/dialogflow-agent/agent.json
new file mode 100755
index 0000000..3e3d224
--- /dev/null
+++ b/samples/quick-start/dialogflow-agent/agent.json
@@ -0,0 +1,37 @@
+{
+  "description": "",
+  "language": "en",
+  "disableInteractionLogs": false,
+  "googleAssistant": {
+    "googleAssistantCompatible": true,
+    "project": "libsample-quickstart",
+    "welcomeIntentSignInRequired": false,
+    "startIntents": [],
+    "systemIntents": [],
+    "endIntentIds": [],
+    "oAuthLinking": {
+      "required": false,
+      "grantType": "AUTH_CODE_GRANT"
+    },
+    "voiceType": "MALE_1",
+    "capabilities": [],
+    "protocolVersion": "V2",
+    "autoPreviewEnabled": true
+  },
+  "defaultTimezone": "America/Los_Angeles",
+  "webhook": {
+    "url": "https://us-central1-libsample-advanced.cloudfunctions.net/dialogflowFirebaseFulfillment",
+    "headers": {
+      "": ""
+    },
+    "available": true,
+    "useForDomains": false,
+    "cloudFunctionsEnabled": true,
+    "cloudFunctionsInitialized": true
+  },
+  "isPrivate": true,
+  "customClassifierMode": "use.after",
+  "mlMinConfidence": 0.3,
+  "supportedLanguages": [],
+  "onePlatformApiVersion": "v2"
+}
\ No newline at end of file
diff --git a/samples/quick-start/dialogflow-agent/intents/Default Fallback Intent.json b/samples/quick-start/dialogflow-agent/intents/Default Fallback Intent.json
new file mode 100755
index 0000000..8a38b58
--- /dev/null
+++ b/samples/quick-start/dialogflow-agent/intents/Default Fallback Intent.json	
@@ -0,0 +1,41 @@
+{
+  "id": "18a3bd14-1921-47d9-bcca-a1d84dc4b990",
+  "name": "Default Fallback Intent",
+  "auto": false,
+  "contexts": [],
+  "responses": [
+    {
+      "resetContexts": false,
+      "action": "input.unknown",
+      "affectedContexts": [],
+      "parameters": [],
+      "messages": [
+        {
+          "type": 0,
+          "lang": "en",
+          "speech": [
+            "I didn\u0027t get that. Can you say it again?",
+            "I missed what you said. Say it again?",
+            "Sorry, could you say that again?",
+            "Sorry, can you say that again?",
+            "Can you say that again?",
+            "Sorry, I didn\u0027t get that.",
+            "Sorry, what was that?",
+            "One more time?",
+            "What was that?",
+            "Say that again?",
+            "I didn\u0027t get that.",
+            "I missed that."
+          ]
+        }
+      ],
+      "defaultResponsePlatforms": {},
+      "speech": []
+    }
+  ],
+  "priority": 500000,
+  "webhookUsed": true,
+  "webhookForSlotFilling": false,
+  "fallbackIntent": true,
+  "events": []
+}
\ No newline at end of file
diff --git a/samples/quick-start/dialogflow-agent/intents/Default Welcome Intent.json b/samples/quick-start/dialogflow-agent/intents/Default Welcome Intent.json
new file mode 100755
index 0000000..86ca6bd
--- /dev/null
+++ b/samples/quick-start/dialogflow-agent/intents/Default Welcome Intent.json	
@@ -0,0 +1,37 @@
+{
+  "id": "719886eb-9eb5-47ed-90c2-9279aec3d305",
+  "name": "Default Welcome Intent",
+  "auto": true,
+  "contexts": [],
+  "responses": [
+    {
+      "resetContexts": false,
+      "action": "input.welcome",
+      "affectedContexts": [],
+      "parameters": [],
+      "messages": [
+        {
+          "type": 0,
+          "lang": "en",
+          "speech": [
+            "Hi!",
+            "Hello!",
+            "Good day!",
+            "Greetings!"
+          ]
+        }
+      ],
+      "defaultResponsePlatforms": {},
+      "speech": []
+    }
+  ],
+  "priority": 500000,
+  "webhookUsed": true,
+  "webhookForSlotFilling": false,
+  "fallbackIntent": false,
+  "events": [
+    {
+      "name": "WELCOME"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/samples/quick-start/dialogflow-agent/package.json b/samples/quick-start/dialogflow-agent/package.json
new file mode 100755
index 0000000..688e939
--- /dev/null
+++ b/samples/quick-start/dialogflow-agent/package.json
@@ -0,0 +1,3 @@
+{
+  "version": "1.0.0"
+}
\ No newline at end of file
diff --git a/samples/quick-start/functions/index.js b/samples/quick-start/functions/index.js
index 13660af..a0b2a97 100644
--- a/samples/quick-start/functions/index.js
+++ b/samples/quick-start/functions/index.js
@@ -17,8 +17,7 @@
 'use strict';
 
 const functions = require('firebase-functions');
-const {WebhookClient} = require('dialogflow-fulfillment');
-const {Card, Suggestion} = require('dialogflow-fulfillment');
+const {WebhookClient, Card, Suggestion} = require('dialogflow-fulfillment');
 
 process.env.DEBUG = 'dialogflow:debug'; // enables lib debugging statements
 
diff --git a/samples/quick-start/functions/package.json b/samples/quick-start/functions/package.json
index 4990629..7810bde 100644
--- a/samples/quick-start/functions/package.json
+++ b/samples/quick-start/functions/package.json
@@ -13,8 +13,9 @@
     "deploy": "firebase deploy --only functions:dialogflowFirebaseFulfillment"
   },
   "dependencies": {
-    "firebase-admin": "^4.2.1",
-    "firebase-functions": "^0.5.7",
-    "dialogflow-fulfillment": "^0.4.0"
+    "firebase-admin": "^5.12.1",
+    "firebase-functions": "^1.0.3",
+    "dialogflow-fulfillment": "^0.4.1",
+    "actions-on-google": "^2.1.3"
   }
 }
\ No newline at end of file