Merge branch 'master' into new_staging

app/templates/components/email-message.html

@@ -50,7 +50,7 @@
       {% if not expanded %}
       <div class="email-message-body-wrapper">
       {% endif %}
-        {{ body|nl2br }}
+        {{ body }}
       {% if not expanded %}
       </div>
       <div class='toggle' tabindex='0'>...<span class='visually-hidden'>show full email</span></div>

app/templates/views/api-keys.html

@@ -3,7 +3,7 @@
 {% from "components/api-key.html" import api_key %}
 
 {% block page_title %}
-  API keys – GOV.UK Notify
+  API integration – GOV.UK Notify
 {% endblock %}
 
 {% block maincolumn_content %}

app/templates/views/register-from-invite.html

@@ -14,7 +14,7 @@ Create an account – GOV.UK Notify
     <p>Your account will be created with this email: {{email_address}}</p>
     <form method="post" autocomplete="nope">
       {{ textbox(form.name, width='3-4') }}
-      {{ textbox(form.mobile_number, width='3-4') }}
+      {{ textbox(form.mobile_number, width='3-4', hint='We’ll send you a verification code by text message') }}
       {{ textbox(form.password, hint="Your password must have at least 10 characters", width='3-4') }}
       {{ page_footer("Continue") }}
       {{form.service}}

app/templates/views/send-from-api.html

@@ -4,7 +4,7 @@
 {% from "components/api-key.html" import api_key %}
 
 {% block page_title %}
-  API integration – GOV.UK Notify
+  API info – GOV.UK Notify
 {% endblock %}
 
 {% block maincolumn_content %}

package.json

@@ -23,7 +23,7 @@
     "diff-dom": "2.0.3",
     "govuk-elements-sass": "1.1.1",
     "govuk_frontend_toolkit": "4.6.0",
-    "govuk_template_jinja": "https://github.com/alphagov/govuk_template/releases/download/v0.17.1/jinja_govuk_template-0.17.1.tgz",
+    "govuk_template_jinja": "https://github.com/alphagov/govuk_template/releases/download/v0.18.0/jinja_govuk_template-0.18.0.tgz",
     "gulp": "3.9.0",
     "gulp-add-src": "0.2.0",
     "gulp-babel": "6.1.1",

requirements.txt

@@ -19,4 +19,4 @@ pytz==2016.4
 
 git+https://github.com/alphagov/notifications-python-client.git@1.0.0#egg=notifications-python-client==1.0.0
 
-git+https://github.com/alphagov/notifications-utils.git@8.6.0#egg=notifications-utils==8.6.0
+git+https://github.com/alphagov/notifications-utils.git@8.7.2#egg=notifications-utils==8.7.2