Update all dates to use utc, only in the template is it converted to british time.

Template versions and template version pages added.

Fix merge changes.

tests/app/main/views/test_template_history.py

@@ -0,0 +1,68 @@
+import json
+from flask import url_for
+
+
+def test_view_template_version(app_,
+                               api_user_active,
+                               mock_login,
+                               mock_get_service,
+                               mock_get_template_version,
+                               mock_get_user,
+                               mock_get_user_by_email,
+                               mock_has_permissions,
+                               fake_uuid):
+    with app_.test_request_context():
+        with app_.test_client() as client:
+            client.login(api_user_active)
+            service_id = fake_uuid
+            template_id = fake_uuid
+            version = 1
+            resp = client.get(url_for(
+                '.view_template_version',
+                service_id=service_id,
+                template_id=template_id,
+                version=version))
+
+    assert resp.status_code == 200
+    resp_data = resp.get_data(as_text=True)
+    template = mock_get_template_version(service_id, template_id, version)
+    assert api_user_active.name in resp_data
+    assert template['data']['content'] in resp_data
+    mock_get_template_version.assert_called_with(
+        service_id,
+        template_id,
+        version
+    )
+
+
+def test_view_template_versions(app_,
+                                api_user_active,
+                                mock_login,
+                                mock_get_service,
+                                mock_get_template_versions,
+                                mock_get_service_template,
+                                mock_get_user,
+                                mock_get_user_by_email,
+                                mock_has_permissions,
+                                fake_uuid):
+    with app_.test_request_context():
+        with app_.test_client() as client:
+            client.login(api_user_active)
+            service_id = fake_uuid
+            template_id = fake_uuid
+            version = 1
+            resp = client.get(url_for(
+                '.view_template_versions',
+                service_id=service_id,
+                template_id=template_id
+            ))
+
+    assert resp.status_code == 200
+    resp_data = resp.get_data(as_text=True)
+    versions = mock_get_template_versions(service_id, template_id)
+    assert api_user_active.name in resp_data
+    assert versions['data'][0]['content'] in resp_data
+    mock_get_template_versions.assert_called_with(
+        service_id,
+        template_id
+    )